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

kbr at google.com kbr at google.com
Wed Dec 22 13:01:00 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 1c191f4187533edd6c7478fdf116672b7b138fab
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 4 02:54:21 2010 +0000

    2010-09-03  Kenneth Russell  <kbr at google.com>
    
            Unreviewed, Chromium build fix. Fix breakage on Windows after
            r66787 / https://bugs.webkit.org/show_bug.cgi?id=45223 .
    
            * platform/graphics/chromium/FontChromiumWin.cpp:
            (WebCore::Font::drawGlyphs):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66788 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index de7c54b..e317fa3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-03  Kenneth Russell  <kbr at google.com>
+
+        Unreviewed, Chromium build fix. Fix breakage on Windows after
+        r66787 / https://bugs.webkit.org/show_bug.cgi?id=45223 .
+
+        * platform/graphics/chromium/FontChromiumWin.cpp:
+        (WebCore::Font::drawGlyphs):
+
 2010-09-03  James Robinson  <jamesr at chromium.org>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/platform/graphics/chromium/FontChromiumWin.cpp b/WebCore/platform/graphics/chromium/FontChromiumWin.cpp
index a0060f9..8a77501 100644
--- a/WebCore/platform/graphics/chromium/FontChromiumWin.cpp
+++ b/WebCore/platform/graphics/chromium/FontChromiumWin.cpp
@@ -372,7 +372,7 @@ void Font::drawGlyphs(GraphicsContext* graphicsContext,
                       int numGlyphs,
                       const FloatPoint& point) const
 {
-    gc->platformContext()->prepareForSoftwareDraw();
+    graphicsContext->platformContext()->prepareForSoftwareDraw();
 
     SkColor color = graphicsContext->platformContext()->effectiveFillColor();
     unsigned char alpha = SkColorGetA(color);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list