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

[paroga at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 1c9f42f9d4a72f51bec6b3dfcaec3b4d4e23e96d
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 2 14:28:31 2010 +0000

    2010-12-02  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by Andreas Kling.
    
            [WX] Remove "current path" of GraphicsContext
            https://bugs.webkit.org/show_bug.cgi?id=50286
    
            * platform/graphics/GraphicsContext.h:
            * platform/graphics/wx/GraphicsContextWx.cpp:
            (WebCore::GraphicsContext::GraphicsContext):
            (WebCore::GraphicsContext::fillPath):
            (WebCore::GraphicsContext::strokePath):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73129 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cb3299e..fb04e82 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-02  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [WX] Remove "current path" of GraphicsContext
+        https://bugs.webkit.org/show_bug.cgi?id=50286
+
+        * platform/graphics/GraphicsContext.h:
+        * platform/graphics/wx/GraphicsContextWx.cpp:
+        (WebCore::GraphicsContext::GraphicsContext):
+        (WebCore::GraphicsContext::fillPath):
+        (WebCore::GraphicsContext::strokePath):
+
 2010-10-26  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/platform/graphics/GraphicsContext.h b/WebCore/platform/graphics/GraphicsContext.h
index 9425bf6..0134510 100644
--- a/WebCore/platform/graphics/GraphicsContext.h
+++ b/WebCore/platform/graphics/GraphicsContext.h
@@ -301,7 +301,7 @@ namespace WebCore {
 
         void setCompositeOperation(CompositeOperator);
 
-#if PLATFORM(SKIA) || PLATFORM(WX) || PLATFORM(OPENVG) || OS(WINCE)
+#if PLATFORM(SKIA) || PLATFORM(OPENVG) || OS(WINCE)
         void beginPath();
         void addPath(const Path&);
 #endif
diff --git a/WebCore/platform/graphics/wx/GraphicsContextWx.cpp b/WebCore/platform/graphics/wx/GraphicsContextWx.cpp
index ba96352..3428969 100644
--- a/WebCore/platform/graphics/wx/GraphicsContextWx.cpp
+++ b/WebCore/platform/graphics/wx/GraphicsContextWx.cpp
@@ -91,7 +91,6 @@ public:
 
 #if USE(WXGC)
     wxGCDC* context;
-    wxGraphicsPath currentPath;
 #else
     wxWindowDC* context;
 #endif
@@ -125,9 +124,6 @@ GraphicsContext::GraphicsContext(PlatformGraphicsContext* context)
     }
 #if USE(WXGC)
     m_data->context = (wxGCDC*)context;
-    wxGraphicsContext* gc = m_data->context->GetGraphicsContext();
-    if (gc)
-        m_data->currentPath = gc->CreatePath();
 #else
     m_data->context = (wxWindowDC*)context;
 #endif
@@ -459,23 +455,6 @@ void GraphicsContext::setCompositeOperation(CompositeOperator op)
     }
 }
 
-void GraphicsContext::beginPath()
-{
-#if USE(WXGC)
-    wxGraphicsContext* gc = m_data->context->GetGraphicsContext();
-    if (gc)
-        m_data->currentPath = gc->CreatePath();
-#endif
-}
-
-void GraphicsContext::addPath(const Path& path)
-{
-#if USE(WXGC)
-    if (path.platformPath())
-        m_data->currentPath.AddPath(*path.platformPath());
-#endif
-}
-
 void GraphicsContext::setPlatformStrokeColor(const Color& color, ColorSpace colorSpace)
 {
     if (paintingDisabled())
@@ -536,26 +515,18 @@ InterpolationQuality GraphicsContext::imageInterpolationQuality() const
 void GraphicsContext::fillPath(const Path& path)
 {
 #if USE(WXGC)
-    // FIXME: Be smarter about this.
-    beginPath();
-    addPath(path);
-
     wxGraphicsContext* gc = m_data->context->GetGraphicsContext();
     if (gc)
-        gc->FillPath(m_data->currentPath);
+        gc->FillPath(path.platformPath());
 #endif
 }
 
 void GraphicsContext::strokePath(const Path& path)
 {
 #if USE(WXGC)
-    // FIXME: Be smarter about this.
-    beginPath();
-    addPath(path);
-
     wxGraphicsContext* gc = m_data->context->GetGraphicsContext();
     if (gc)
-        gc->StrokePath(m_data->currentPath);
+        gc->StrokePath(path.platformPath());
 #endif
 }
 

-- 
WebKit Debian packaging