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

[simon.fraser at apple.com]

The following commit has been merged in the debian/experimental branch:
commit babc69bda213d2f2054e57e2b849bf1a4ec7210a
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 3 20:53:42 2010 +0000

    2010-12-03  Simon Fraser  <simon.fraser at apple.com>
    
            Fix Chromium build.
    
            * platform/graphics/skia/PlatformContextSkia.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73290 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6d3c6c2..86718be 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-03  Simon Fraser  <simon.fraser at apple.com>
+
+        Fix Chromium build.
+
+        * platform/graphics/skia/PlatformContextSkia.h:
+
 2010-12-03  Patrick Gansterer  <paroga at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebCore/platform/graphics/skia/PlatformContextSkia.h b/WebCore/platform/graphics/skia/PlatformContextSkia.h
index 110085d..11b311a 100644
--- a/WebCore/platform/graphics/skia/PlatformContextSkia.h
+++ b/WebCore/platform/graphics/skia/PlatformContextSkia.h
@@ -125,14 +125,14 @@ public:
     void setStrokeColor(SkColor);
     void setStrokeThickness(float thickness);
     void setStrokeShader(SkShader*);
-    void setTextDrawingMode(int mode);
+    void setTextDrawingMode(TextDrawingModeFlags mode);
     void setUseAntialiasing(bool enable);
     void setDashPathEffect(SkDashPathEffect*);
 
     SkDrawLooper* getDrawLooper() const;
     StrokeStyle getStrokeStyle() const;
     float getStrokeThickness() const;
-    int getTextDrawingMode() const;
+    TextDrawingModeFlags getTextDrawingMode() const;
     float getAlpha() const;
     int getNormalizedAlpha() const;
 

-- 
WebKit Debian packaging