Web Inspector: Fix shape-highlight layout tests
authordrousso@apple.com <drousso@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 9 Jul 2015 22:07:51 +0000 (22:07 +0000)
committerdrousso@apple.com <drousso@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 9 Jul 2015 22:07:51 +0000 (22:07 +0000)
https://bugs.webkit.org/show_bug.cgi?id=146080

Reviewed by Joseph Pecoraro.

Source/WebCore:

* inspector/InspectorOverlay.cpp:
(WebCore::buildObjectForShapeOutside): Now properly returns the shape margin.

LayoutTests:

* http/tests/inspector/dom/shapes-test.js: Updated.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@186639 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/http/tests/inspector/dom/shapes-test.js
Source/WebCore/ChangeLog
Source/WebCore/inspector/InspectorOverlay.cpp

index 3e6e2ce..98abcc0 100644 (file)
@@ -1,3 +1,12 @@
+2015-07-09  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Fix shape-highlight layout tests
+        https://bugs.webkit.org/show_bug.cgi?id=146080
+
+        Reviewed by Joseph Pecoraro.
+
+        * http/tests/inspector/dom/shapes-test.js: Updated.
+
 2015-07-09  Michael Saboff  <msaboff@apple.com>
 
         REGRESSION (r180248): Repro Crash: com.apple.WebKit.WebContent at com.apple.JavaScriptCore: JSC::createRangeError + 20
index 23c5695..bcce9f1 100644 (file)
@@ -31,11 +31,11 @@ InspectorTest.Shapes = {
         }
 
         function receivedHighlightObject(error, payload, wasThrown) {
-            console.assert(!error, "When evaluating code, received unexpected error:" + error);
-            console.assert(!error, "When evaluating code, an exception was thrown:" + wasThrown);
+            InspectorTest.assert(!error, "When evaluating code, received unexpected error:" + error);
+            InspectorTest.assert(!error, "When evaluating code, an exception was thrown:" + wasThrown);
 
             var data = JSON.parse(payload.value);
-            callback(data.elementInfo.shapeOutsideInfo);
+            callback(data[0].elementData.shapeOutsideData);
         }
     },
 
index 36700b4..1504997 100644 (file)
@@ -1,3 +1,13 @@
+2015-07-09  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Fix shape-highlight layout tests
+        https://bugs.webkit.org/show_bug.cgi?id=146080
+
+        Reviewed by Joseph Pecoraro.
+
+        * inspector/InspectorOverlay.cpp:
+        (WebCore::buildObjectForShapeOutside): Now properly returns the shape margin.
+
 2015-07-09  Eric Carlson  <eric.carlson@apple.com>
 
         [Mac] AirPlay to password protected AppleTV fails
index faea7ce..6733ade 100644 (file)
@@ -675,7 +675,7 @@ static RefPtr<Inspector::Protocol::OverlayTypes::ShapeOutsideData> buildObjectFo
 
             paths.marginShape.apply(&info, &appendPathSegment);
 
-            shapeObject->setMarginShape(shapePath.copyRef());
+            shapeObject->setMarginShape(marginShapePath.copyRef());
         }
     }