Changeset 87099 in webkit

Timestamp:

May 23, 2011 2:50:03 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-23 Mike Reed <​reed@google.com>

Reviewed by James Robinson.

Skia: Need to implement GraphicsContext::clipConvexPolygon()
​https://bugs.webkit.org/show_bug.cgi?id=41311

No new tests.

• platform/graphics/skia/GraphicsContextSkia.cpp: (WebCore::setPathFromConvexPoints): (WebCore::GraphicsContext::drawConvexPolygon): (WebCore::GraphicsContext::clipConvexPolygon):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/skia/GraphicsContextSkia.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-23  Mike Reed  <reed@google.com>
+
+        Reviewed by James Robinson.
+
+        Skia: Need to implement GraphicsContext::clipConvexPolygon()
+        https://bugs.webkit.org/show_bug.cgi?id=41311
+
+        No new tests. 
+
+        * platform/graphics/skia/GraphicsContextSkia.cpp:
+        (WebCore::setPathFromConvexPoints):
+        (WebCore::GraphicsContext::drawConvexPolygon):
+        (WebCore::GraphicsContext::clipConvexPolygon):
+
 2011-05-23  James Simonsen  <simonjam@chromium.org>
 

trunk/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp

@@ -450 +450 @@
 }
 
+static void setPathFromConvexPoints(SkPath* path, size_t numPoints, const FloatPoint* points)
+{
+    path->incReserve(numPoints);
+    path->moveTo(WebCoreFloatToSkScalar(points[0].x()),
+                 WebCoreFloatToSkScalar(points[0].y()));
+    for (size_t i = 1; i < numPoints; ++i) {
+        path->lineTo(WebCoreFloatToSkScalar(points[i].x()),
+                     WebCoreFloatToSkScalar(points[i].y()));
+    }
+    path->setIsConvex(true);
+}
+
 void GraphicsContext::drawConvexPolygon(size_t numPoints,
                                         const FloatPoint* points,
@@ -463 +475 @@
 
     SkPath path;
-
-    path.incReserve(numPoints);
-    path.moveTo(WebCoreFloatToSkScalar(points[0].x()),
-                WebCoreFloatToSkScalar(points[0].y()));
-    for (size_t i = 1; i < numPoints; i++) {
-        path.lineTo(WebCoreFloatToSkScalar(points[i].x()),
-                    WebCoreFloatToSkScalar(points[i].y()));
-    }
+    setPathFromConvexPoints(&path, numPoints, points);
 
     if (!isPathSkiaSafe(getCTM(), path))
@@ -494 +499 @@
         return;
 
-    // FIXME: IMPLEMENT!!
+    SkPath path;
+    setPathFromConvexPoints(&path, numPoints, points);
+    platformContext()->canvas()->clipPath(path);
 }