Changeset 187018 in webkit

Timestamp:

Jul 19, 2015 11:38:40 PM (9 years ago)

Author:

timothy_horton@apple.com

Message:

Make shrink-wrapping test a ref-test instead of pixel-test
​https://bugs.webkit.org/show_bug.cgi?id=147081

Reviewed by Sam Weinig.

Source/WebCore:

Nobody runs pixel tests.

• svg/SVGPathUtilities.cpp:

(WebCore::pathIteratorForBuildingString):
(WebCore::buildStringFromPath):

• svg/SVGPathUtilities.h:

Add a helper that turns a Path into a SVG path string.

• testing/Internals.cpp:

(WebCore::Internals::pathStringWithShrinkWrappedRects):

• testing/Internals.h:
• testing/Internals.idl:

Have the internals shrink-wrap method return an SVG path instead of a DOMPath.

LayoutTests:

• fast/shrink-wrap/rect-shrink-wrap-expected.html: Added.
• fast/shrink-wrap/rect-shrink-wrap-expected.png: Removed.
• fast/shrink-wrap/rect-shrink-wrap-expected.txt: Removed.
• fast/shrink-wrap/rect-shrink-wrap.html:

SVG all the things.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/shrink-wrap/rect-shrink-wrap-expected.html (added)
• LayoutTests/fast/shrink-wrap/rect-shrink-wrap-expected.png (deleted)
• LayoutTests/fast/shrink-wrap/rect-shrink-wrap-expected.txt (deleted)
• LayoutTests/fast/shrink-wrap/rect-shrink-wrap.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/svg/SVGPathUtilities.cpp (modified) (2 diffs)
• Source/WebCore/svg/SVGPathUtilities.h (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (2 diffs)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-07-19  Tim Horton  <timothy_horton@apple.com>
+
+        Make shrink-wrapping test a ref-test instead of pixel-test
+        https://bugs.webkit.org/show_bug.cgi?id=147081
+
+        Reviewed by Sam Weinig.
+
+        * fast/shrink-wrap/rect-shrink-wrap-expected.html: Added.
+        * fast/shrink-wrap/rect-shrink-wrap-expected.png: Removed.
+        * fast/shrink-wrap/rect-shrink-wrap-expected.txt: Removed.
+        * fast/shrink-wrap/rect-shrink-wrap.html:
+        SVG all the things.
+
 2015-07-19  Jordan Harband  <ljharb@gmail.com>
 

trunk/LayoutTests/fast/shrink-wrap/rect-shrink-wrap.html

@@ -1 +1 @@
 <script>
 
+if (!window.internals)
+        document.write("This test must be run in a test runner.")
+
 function testRects(offset, rects, radius) {
-    if (!window.internals)
-        document.write("This test must be run in a test runner.")
-
     if (radius == undefined)
         radius = 8;
 
-    var concatRects = [];
-    for (var i in rects)
-        Array.prototype.push.apply(concatRects, rects[i]);
-
-    var path = undefined;
-    if (window.internals)
-        path = window.internals.pathWithShrinkWrappedRects(concatRects, radius);
-
-    var canvas = document.getElementById("shrink");
-    var ctx = canvas.getContext("2d");
-
-    ctx.save();
-
-    ctx.translate.apply(ctx, offset);
-
-    ctx.fillStyle = "rgba(0,0,0,0.2)";
-
-    for (var i in rects)
-        ctx.fillRect.apply(ctx, rects[i]);
-
-    ctx.strokeStyle = "rgba(0,0,0,0.5)";
-    ctx.lineWidth = 1;
-    for (var i in rects)
-        ctx.strokeRect.apply(ctx, rects[i]);
-
-    ctx.strokeStyle = "blue";
-    ctx.lineWidth = 3;
-    if (path)
-        ctx.stroke(path);
-
-    ctx.restore();
+    var gElement = document.createElementNS("http://www.w3.org/2000/svg", "g");
+    gElement.setAttribute("transform", "translate(" + offset[0] + ", " + offset[1] + ")");
+    document.getElementById("paths").appendChild(gElement);
+
+    for (var i in rects) {
+        var rectElement = document.createElementNS("http://www.w3.org/2000/svg", "rect");
+        rectElement.setAttribute("x", rects[i][0]);
+        rectElement.setAttribute("y", rects[i][1]);
+        rectElement.setAttribute("width", rects[i][2]);
+        rectElement.setAttribute("height", rects[i][3]);
+        rectElement.setAttribute("fill", "rgba(0, 0, 0, 0.2)");
+        rectElement.setAttribute("stroke", "rgba(0, 0, 0, 0.5)");
+        gElement.appendChild(rectElement);
+    }
+
+    if (window.internals) {
+        var concatRects = [];
+        for (var i in rects)
+            Array.prototype.push.apply(concatRects, rects[i]);
+        var pathString = window.internals.pathStringWithShrinkWrappedRects(concatRects, radius);
+        var pathElement = document.createElementNS("http://www.w3.org/2000/svg", "path");
+        pathElement.setAttribute("d", pathString)
+        pathElement.setAttribute("fill", "none");
+        pathElement.setAttribute("stroke", "blue");
+        pathElement.setAttribute("stroke-width", "3");
+        gElement.appendChild(pathElement);
+    }
 }
 
@@ -244 +240 @@
 </style>
 
-<canvas id="shrink" width="800" height="600"></canvas>
+<svg id="paths" width="800" height="600"></svg>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-19  Tim Horton  <timothy_horton@apple.com>
+
+        Make shrink-wrapping test a ref-test instead of pixel-test
+        https://bugs.webkit.org/show_bug.cgi?id=147081
+
+        Reviewed by Sam Weinig.
+
+        Nobody runs pixel tests.
+
+        * svg/SVGPathUtilities.cpp:
+        (WebCore::pathIteratorForBuildingString):
+        (WebCore::buildStringFromPath):
+        * svg/SVGPathUtilities.h:
+        Add a helper that turns a Path into a SVG path string.
+
+        * testing/Internals.cpp:
+        (WebCore::Internals::pathStringWithShrinkWrappedRects):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+        Have the internals shrink-wrap method return an SVG path instead of a DOMPath.
+
 2015-07-19  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebCore/svg/SVGPathUtilities.cpp

@@ -27 +27 @@
 #include "SVGPathByteStreamBuilder.h"
 #include "SVGPathByteStreamSource.h"
+#include "SVGPathConsumer.h"
 #include "SVGPathElement.h"
 #include "SVGPathParser.h"
@@ -331 +332 @@
 }
 
-}
+static void pathIteratorForBuildingString(void* info, const PathElement* pathElement)
+{
+    SVGPathConsumer* consumer = static_cast<SVGPathConsumer*>(info);
+
+    switch (pathElement->type) {
+    case PathElementMoveToPoint:
+        consumer->moveTo(pathElement->points[0], false, AbsoluteCoordinates);
+        break;
+    case PathElementAddLineToPoint:
+        consumer->lineTo(pathElement->points[0], AbsoluteCoordinates);
+        break;
+    case PathElementAddQuadCurveToPoint:
+        consumer->curveToQuadratic(pathElement->points[0], pathElement->points[1], AbsoluteCoordinates);
+        break;
+    case PathElementAddCurveToPoint:
+        consumer->curveToCubic(pathElement->points[0], pathElement->points[1], pathElement->points[2], AbsoluteCoordinates);
+        break;
+    case PathElementCloseSubpath:
+        consumer->closePath();
+        break;
+
+    default:
+        ASSERT_NOT_REACHED();
+        break;
+    }
+}
+
+bool buildStringFromPath(const Path& path, String& string)
+{
+    // Ideally we would have a SVGPathPlatformPathSource, but it's not possible to manually iterate
+    // a path, only apply a function to all path elements at once.
+
+    SVGPathStringBuilder* builder = globalSVGPathStringBuilder();
+    path.apply(builder, &pathIteratorForBuildingString);
+    string = builder->result();
+    static_cast<SVGPathConsumer*>(builder)->cleanup();
+
+    return true;
+}
+
+}

trunk/Source/WebCore/svg/SVGPathUtilities.h

@@ -56 +56 @@
 bool getPointAtLengthOfSVGPathByteStream(SVGPathByteStream*, float length, SVGPoint&);
 
+// Path -> String
+WEBCORE_EXPORT bool buildStringFromPath(const Path&, String&);
+
 } // namespace WebCore
 

trunk/Source/WebCore/testing/Internals.cpp

@@ -2983 +2983 @@
 }
 
-PassRefPtr<DOMPath> Internals::pathWithShrinkWrappedRects(Vector<double> rectComponents, double radius, ExceptionCode& ec)
+String Internals::pathStringWithShrinkWrappedRects(Vector<double> rectComponents, double radius, ExceptionCode& ec)
 {
     if (rectComponents.size() % 4) {
         ec = INVALID_ACCESS_ERR;
-        return nullptr;
+        return String();
     }
 
@@ -3003 +3003 @@
 
     Path path = PathUtilities::pathWithShrinkWrappedRects(rects, radius);
-    return DOMPath::create(path);
-}
-
-}
+
+    String pathString;
+    buildStringFromPath(path, pathString);
+
+    return pathString;
+}
+
+}

trunk/Source/WebCore/testing/Internals.h

@@ -425 +425 @@
 #endif
 
-    PassRefPtr<DOMPath> pathWithShrinkWrappedRects(Vector<double> rectComponents, double radius, ExceptionCode&);
+    String pathStringWithShrinkWrappedRects(Vector<double> rectComponents, double radius, ExceptionCode&);
 
 private:

trunk/Source/WebCore/testing/Internals.idl

@@ -388 +388 @@
 #endif
 
-    [RaisesException] DOMPath pathWithShrinkWrappedRects(sequence<double> rectComponents, double radius);
-};
+    [RaisesException] DOMString pathStringWithShrinkWrappedRects(sequence<double> rectComponents, double radius);
+};