Changeset 104609 in webkit

Timestamp:

Jan 10, 2012, 11:50:40 AM (13 years ago)

Author:

reed@google.com

Message:

[skia] not all convex paths are convex, so recompute convexity for the problematic ones
​https://bugs.webkit.org/show_bug.cgi?id=75960

Reviewed by Stephen White.

No new tests.
See related chrome issue
​http://code.google.com/p/chromium/issues/detail?id=108605

• platform/graphics/skia/GraphicsContextSkia.cpp:

(WebCore::setPathFromConvexPoints):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-10  Mike Reed  <reed@google.com>
+
+        [skia] not all convex paths are convex, so recompute convexity for the problematic ones
+        https://bugs.webkit.org/show_bug.cgi?id=75960
+
+        Reviewed by Stephen White.
+
+        No new tests.
+        See related chrome issue
+        http://code.google.com/p/chromium/issues/detail?id=108605
+
+        * platform/graphics/skia/GraphicsContextSkia.cpp:
+        (WebCore::setPathFromConvexPoints):
+
 2012-01-10  Gavin Barraclough  <barraclough@apple.com>
 

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

@@ -441 +441 @@
                      WebCoreFloatToSkScalar(points[i].y()));
     }
-    path->setIsConvex(true);
+
+    /*  The code used to just blindly call this
+            path->setIsConvex(true);
+        But webkit can sometimes send us non-convex 4-point values, so we mark the path's
+        convexity as unknown, so it will get computed by skia at draw time.
+        See crbug.com 108605
+    */
+    SkPath::Convexity convexity = SkPath::kConvex_Convexity;
+    if (numPoints == 4)
+        convexity = SkPath::kUnknown_Convexity;
+    path->setConvexity(convexity);
 }