Title: [186639] trunk
- Revision
- 186639
- Author
- drou...@apple.com
- Date
- 2015-07-09 15:07:51 -0700 (Thu, 09 Jul 2015)
Log Message
Web Inspector: Fix shape-highlight layout tests
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.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (186638 => 186639)
--- trunk/LayoutTests/ChangeLog 2015-07-09 22:02:21 UTC (rev 186638)
+++ trunk/LayoutTests/ChangeLog 2015-07-09 22:07:51 UTC (rev 186639)
@@ -1,3 +1,12 @@
+2015-07-09 Devin Rousso <drou...@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 <msab...@apple.com>
REGRESSION (r180248): Repro Crash: com.apple.WebKit.WebContent at com.apple._javascript_Core: JSC::createRangeError + 20
Modified: trunk/LayoutTests/http/tests/inspector/dom/shapes-test.js (186638 => 186639)
--- trunk/LayoutTests/http/tests/inspector/dom/shapes-test.js 2015-07-09 22:02:21 UTC (rev 186638)
+++ trunk/LayoutTests/http/tests/inspector/dom/shapes-test.js 2015-07-09 22:07:51 UTC (rev 186639)
@@ -31,11 +31,11 @@
}
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 = ""
- callback(data.elementInfo.shapeOutsideInfo);
+ callback(data[0].elementData.shapeOutsideData);
}
},
Modified: trunk/Source/WebCore/ChangeLog (186638 => 186639)
--- trunk/Source/WebCore/ChangeLog 2015-07-09 22:02:21 UTC (rev 186638)
+++ trunk/Source/WebCore/ChangeLog 2015-07-09 22:07:51 UTC (rev 186639)
@@ -1,3 +1,13 @@
+2015-07-09 Devin Rousso <drou...@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.carl...@apple.com>
[Mac] AirPlay to password protected AppleTV fails
Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (186638 => 186639)
--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2015-07-09 22:02:21 UTC (rev 186638)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2015-07-09 22:07:51 UTC (rev 186639)
@@ -675,7 +675,7 @@
paths.marginShape.apply(&info, &appendPathSegment);
- shapeObject->setMarginShape(shapePath.copyRef());
+ shapeObject->setMarginShape(marginShapePath.copyRef());
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
