[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[levin at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 54d5c8306d436c46c46e873839c0e47374feab5e
Author: levin at chromium.org <levin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 8 23:54:41 2009 +0000

    Unreviewed build fix for chromium.
    
    * platform/graphics/skia/GraphicsContextSkia.cpp:
    (WebCore::GraphicsContext::fillPath):
    (WebCore::GraphicsContext::fillRect):
    (WebCore::GraphicsContext::strokePath):
    (WebCore::GraphicsContext::strokeRect):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50630 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 51058b1..0c7654f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,16 @@
 
         Unreviewed build fix for chromium.
 
+        * platform/graphics/skia/GraphicsContextSkia.cpp:
+        (WebCore::GraphicsContext::fillPath):
+        (WebCore::GraphicsContext::fillRect):
+        (WebCore::GraphicsContext::strokePath):
+        (WebCore::GraphicsContext::strokeRect):
+
+2009-11-08  David Levin  <levin at chromium.org>
+
+        Unreviewed build fix for chromium.
+
         Build fix for https://bugs.webkit.org/show_bug.cgi?id=31219
         Clean up GraphicsContext's current concept of ColorSpace
 
diff --git a/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp b/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp
index 012dda2..beaccef 100644
--- a/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp
+++ b/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp
@@ -704,8 +704,6 @@ void GraphicsContext::fillPath()
       return;
 
     const GraphicsContextState& state = m_common->state;
-    ColorType colorSpace = state.fillType;
-
     path.setFillType(state.fillRule == RULE_EVENODD ?
         SkPath::kEvenOdd_FillType : SkPath::kWinding_FillType);
 
@@ -727,7 +725,6 @@ void GraphicsContext::fillRect(const FloatRect& rect)
     }
 
     const GraphicsContextState& state = m_common->state;
-    ColorType colorSpace = state.fillType;
 
     SkPaint paint;
     platformContext()->setupPaintForFilling(&paint);
@@ -1118,7 +1115,6 @@ void GraphicsContext::strokePath()
         return;
 
     const GraphicsContextState& state = m_common->state;
-    ColorType colorSpace = state.strokeType;
 
     SkPaint paint;
     platformContext()->setupPaintForStroking(&paint, 0, 0);
@@ -1135,7 +1131,6 @@ void GraphicsContext::strokeRect(const FloatRect& rect, float lineWidth)
         return;
 
     const GraphicsContextState& state = m_common->state;
-    ColorType colorSpace = state.strokeType;
 
     SkPaint paint;
     platformContext()->setupPaintForStroking(&paint, 0, 0);

-- 
WebKit Debian packaging