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

mitz at apple.com mitz at apple.com
Wed Dec 22 11:48:57 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit d29cc51e28183e8cd16483013c1221c3b4e4a72e
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 7 22:47:47 2010 +0000

    Use ctFont() to get the CTFont.
    
    Reviewed by Sam Weinig.
    
    * platform/graphics/mac/FontMac.mm:
    (WebCore::showGlyphsWithAdvances):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64926 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fed28c4..9faeb8c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-07  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Use ctFont() to get the CTFont.
+
+        * platform/graphics/mac/FontMac.mm:
+        (WebCore::showGlyphsWithAdvances):
+
 2010-08-07  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/platform/graphics/mac/FontMac.mm b/WebCore/platform/graphics/mac/FontMac.mm
index aeb0ab2..db77402 100644
--- a/WebCore/platform/graphics/mac/FontMac.mm
+++ b/WebCore/platform/graphics/mac/FontMac.mm
@@ -64,7 +64,7 @@ static void showGlyphsWithAdvances(const FontPlatformData& font, CGContextRef co
             positions[i].x = positions[i - 1].x + advance.width;
             positions[i].y = positions[i - 1].y + advance.height;
         }
-        CTFontDrawGlyphs(toCTFontRef(font.font()), glyphs, positions.data(), count, context);
+        CTFontDrawGlyphs(font.ctFont(), glyphs, positions.data(), count, context);
     }
 #endif
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list