[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

andersca at apple.com andersca at apple.com
Wed Dec 22 14:59:03 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit bf77bc1e9f9285d89982e8f0f7263b8b1ddc00cd
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 26 21:30:58 2010 +0000

    Fix 32-bit build.
    
    * platform/graphics/mac/FontMac.mm:
    (WebCore::showGlyphsWithAdvances):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70575 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 726dc2b..12f3e93 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-26  Anders Carlsson  <andersca at apple.com>
+
+        Fix 32-bit build.
+
+        * platform/graphics/mac/FontMac.mm:
+        (WebCore::showGlyphsWithAdvances):
+
 2010-10-26  Jenn Braithwaite  <jennb at chromium.org>
 
         Reviewed by Dmitry Titov.
diff --git a/WebCore/platform/graphics/mac/FontMac.mm b/WebCore/platform/graphics/mac/FontMac.mm
index 377f9fa..d760f5a 100644
--- a/WebCore/platform/graphics/mac/FontMac.mm
+++ b/WebCore/platform/graphics/mac/FontMac.mm
@@ -55,7 +55,7 @@ static void showGlyphsWithAdvances(const SimpleFontData* font, CGContextRef cont
         bool isVertical = platformData.orientation() == Vertical;
 
         if (isVertical) {
-            static const CGAffineTransform rotateLeftTransform = {0.0, -1.0, 1.0, 0.0, 0.0, 0.0};
+            CGAffineTransform rotateLeftTransform = CGAffineTransformMake(0, -1, 1, 0, 0, 0);
 
             savedMatrix = CGContextGetTextMatrix(context);
             CGAffineTransform runMatrix = CGAffineTransformConcat(savedMatrix, rotateLeftTransform);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list