From: Ben Murdoch <benm@google.com>
Date: Fri, 6 May 2011 10:54:21 +0000 (+0100)
Subject: Merge WebKit at r74534: Fix GraphicsContextAndroid.cpp (Paths)
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=aa3c571eb58ddae5c8d2de8a7899e8d7f3f80b0e;p=android-x86%2Fexternal-webkit.git

Merge WebKit at r74534: Fix GraphicsContextAndroid.cpp (Paths)

Update our platform FraphicsContext after upstream Path
refactoring.

See http://trac.webkit.org/changeset/72926

Change-Id: I574ede8dfc74fce5edc3558cd63c6b703f45fe7c
---

diff --git a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
index 429c2f1d1..3744796d2 100644
--- a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
+++ b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
@@ -904,10 +904,15 @@ void GraphicsContext::clipOut(const IntRect& r)
 }
 
 #if ENABLE(SVG)
-void GraphicsContext::clipPath(WindRule clipRule)
+void GraphicsContext::clipPath(const Path& pathToClip, WindRule clipRule)
 {
     if (paintingDisabled())
         return;
+
+    // FIXME: Be smarter about this.
+    beginPath();
+    addPath(pathToClip);
+
     const SkPath* oldPath = m_data->getPath();
     SkPath path(*oldPath);
     path.setFillType(clipRule == RULE_EVENODD ? SkPath::kEvenOdd_FillType : SkPath::kWinding_FillType);
@@ -1236,8 +1241,12 @@ void GraphicsContext::addPath(const Path& p)
     m_data->addPath(*p.platformPath());
 }
 
-void GraphicsContext::fillPath()
+void GraphicsContext::fillPath(const Path& pathToFill)
 {
+    // FIXME: Be smarter about this.
+    beginPath();
+    addPath(pathToFill);
+
     SkPath* path = m_data->getPath();
     if (paintingDisabled() || !path)
         return;
@@ -1261,8 +1270,12 @@ void GraphicsContext::fillPath()
     GC2CANVAS(this)->drawPath(*path, paint);
 }
 
-void GraphicsContext::strokePath()
+void GraphicsContext::strokePath(const Path& pathToStroke)
 {
+    // FIXME: Be smarter about this.
+    beginPath();
+    addPath(pathToStroke);
+
     const SkPath* path = m_data->getPath();
     if (paintingDisabled() || !path)
         return;