Log Message
[WebInspector] inspector-protocol/model/highlight-shape-outside.html is failing https://bugs.webkit.org/show_bug.cgi?id=124660
Reviewed by Timothy Hatcher. I updated the tests syntax to CR, CSS Shapes specification. It's also needed to be updated to the latest WebInspector testing methods. I added some addidional test cases for the highlighting, and also fixed some expected test case in the script, and updated the expected file. * TestExpectations: * inspector/dom/highlight-shape-outside-expected.txt: * inspector/dom/highlight-shape-outside.html: * inspector/dom/shapes-test.js: (InspectorTestProxy.registerInitializer.):
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (166672 => 166673)
--- trunk/LayoutTests/ChangeLog 2014-04-02 22:48:08 UTC (rev 166672)
+++ trunk/LayoutTests/ChangeLog 2014-04-02 23:06:36 UTC (rev 166673)
@@ -1,3 +1,20 @@
+2014-04-02 Zoltan Horvath <[email protected]>
+
+ [WebInspector] inspector-protocol/model/highlight-shape-outside.html is failing
+ https://bugs.webkit.org/show_bug.cgi?id=124660
+
+ Reviewed by Timothy Hatcher.
+
+ I updated the tests syntax to CR, CSS Shapes specification. It's also needed to be updated
+ to the latest WebInspector testing methods. I added some addidional test cases for the highlighting,
+ and also fixed some expected test case in the script, and updated the expected file.
+
+ * TestExpectations:
+ * inspector/dom/highlight-shape-outside-expected.txt:
+ * inspector/dom/highlight-shape-outside.html:
+ * inspector/dom/shapes-test.js:
+ (InspectorTestProxy.registerInitializer.):
+
2014-04-02 Chris Fleizach <[email protected]>
AX: Improve ARIA live region reliability by sending notifications when live regions are created/shown and hidden/destroyed
Modified: trunk/LayoutTests/TestExpectations (166672 => 166673)
--- trunk/LayoutTests/TestExpectations 2014-04-02 22:48:08 UTC (rev 166672)
+++ trunk/LayoutTests/TestExpectations 2014-04-02 23:06:36 UTC (rev 166673)
@@ -49,7 +49,6 @@
fast/mediastream/MediaStream-construct-with-ended-tracks.html [ Skip ]
fast/mediastream/MediaStream-clone.html [ Skip ]
-webkit.org/b/124660 inspector/dom/highlight-shape-outside.html [ Failure ]
webkit.org/b/126519 inspector/dom/highlight-shape-outside-margin.html [ Failure ]
webkit.org/b/126142 css3/calc/transitions-dependent.html [ Pass Failure ]
Modified: trunk/LayoutTests/inspector/dom/highlight-shape-outside-expected.txt (166672 => 166673)
--- trunk/LayoutTests/inspector/dom/highlight-shape-outside-expected.txt 2014-04-02 22:48:08 UTC (rev 166672)
+++ trunk/LayoutTests/inspector/dom/highlight-shape-outside-expected.txt 2014-04-02 23:06:36 UTC (rev 166673)
@@ -1,13 +1,16 @@
-PASS: Actual [M 50 50 L 150 50 L 150 100 L 50 100 L 50 50 Z] Expected [M 50 50 L 150 50 L 150 100 L 50 100 L 50 50 Z]
-PASS: Actual [M 50 50 L 100 50 L 100 100 L 50 100 Z] Expected [M 50 50 L 100 50 L 100 100 L 50 100 Z]
-PASS: Actual [M 75 75 L 175 75 L 175 125 L 75 125 L 75 75 Z] Expected [M 75 75 L 175 75 L 175 125 L 75 125 L 75 75 Z]
-PASS: Actual [M 50 50 L 150 50 L 150 100 L 50 100 L 50 50 Z] Expected [M 50 50 L 150 50 L 150 100 L 50 100 L 50 50 Z]
-PASS: Actual [M 50 50 L 50 100 L 150 100 L 150 50 L 50 50 Z] Expected [M 50 50 L 50 100 L 150 100 L 150 50 L 50 50 Z]
-PASS: Actual [M 150 50 L 150 100 L 50 100 L 50 50 L 150 50 Z] Expected [M 150 50 L 150 100 L 50 100 L 50 50 L 150 50 Z]
-PASS: Actual [M 175 75 L 175 125 L 75 125 L 75 75 L 175 75 Z] Expected [M 175 75 L 175 125 L 75 125 L 75 75 L 175 75 Z]
-PASS: Actual [M 150 50 L 150 100 L 50 100 L 50 50 L 150 50 Z] Expected [M 150 50 L 150 100 L 50 100 L 50 50 L 150 50 Z]
-PASS: Actual [M 25 25 L 125 25 L 125 125 L 25 125 L 25 25 Z] Expected [M 25 25 L 125 25 L 125 125 L 25 125 L 25 25 Z]
-PASS: Actual [M 50 50 L 100 50 L 100 100 L 50 100 Z] Expected [M 50 50 L 100 50 L 100 100 L 50 100 Z]
-PASS: Actual [M 35 35 L 115 35 L 115 65 L 35 65 Z M 35 85 L 115 85 L 115 115 L 35 115 Z] Expected [M 35 35 L 115 35 L 115 65 L 35 65 Z M 35 85 L 115 85 L 115 115 L 35 115 Z]
-PASS: Actual [M 50 50 L 100 50 L 100 100 L 50 100 Z] Expected [M 50 50 L 100 50 L 100 100 L 50 100 Z]
+PASS: .inset
+PASS: .inset.padded
+PASS: .inset.padded.border-box
+PASS: .polygon
+PASS: .polygon.padded.border-box
+PASS: .vertical-lr > .inset
+PASS: .vertical-lr > .inset.padded
+PASS: .vertical-lr > .inset.padded.border-box
+PASS: .vertical-rl > .inset
+PASS: .vertical-rl > .inset.padded
+PASS: .vertical-rl > .inset.padded.border-box
+PASS: .content-box.padded
+PASS: .raster-svg.padded
+PASS: .raster-svg-complex.padded
+PASS: .raster-png.padded
Modified: trunk/LayoutTests/inspector/dom/highlight-shape-outside.html (166672 => 166673)
--- trunk/LayoutTests/inspector/dom/highlight-shape-outside.html 2014-04-02 22:48:08 UTC (rev 166672)
+++ trunk/LayoutTests/inspector/dom/highlight-shape-outside.html 2014-04-02 23:06:36 UTC (rev 166673)
@@ -9,14 +9,13 @@
width: 200px;
height: 200px;
margin-right: -200px;
+ box-sizing: border-box;
}
.padded {
- width: 100px;
- height: 100px;
padding: 25px 75px 75px 25px;
}
-.border-box {
- box-sizing: border-box;
+.vertical-lr, .vertical-rl {
+ float: left;
}
.vertical-lr {
-webkit-writing-mode: vertical-lr;
@@ -24,17 +23,20 @@
.vertical-rl {
-webkit-writing-mode: vertical-rl;
}
-.rectangle {
- -webkit-shape-outside: rectangle(50px, 50px, 100px, 50px) content-box;
+.inset {
+ -webkit-shape-outside: inset(50px 50px 100px 50px) content-box;
}
-.rectangle.border-box {
- -webkit-shape-outside: rectangle(50px, 50px, 100px, 50px) border-box;
+.inset.padded {
+ -webkit-shape-outside: inset(5px 5px 10px 5px) content-box;
}
+.inset.padded.border-box {
+ -webkit-shape-outside: inset(50px 50px 100px 50px) border-box;
+}
.polygon {
- -webkit-shape-outside: polygon(50px 50px, 100px 50px, 100px 100px, 50px 100px) content-box;
+ -webkit-shape-outside: polygon(50px 50px, 150px 50px, 150px 100px, 50px 100px) content-box;
}
.polygon.border-box {
- -webkit-shape-outside: polygon(50px 50px, 100px 50px, 100px 100px, 50px 100px) border-box;
+ -webkit-shape-outside: polygon(50px 50px, 150px 50px, 150px 100px, 50px 100px) border-box;
}
.content-box {
-webkit-shape-outside: content-box;
@@ -56,35 +58,47 @@
function test() {
var testcases = [
{
- 'selector' : '.rectangle',
+ 'selector' : '.inset',
'path' : ['M', 50, 50, 'L', 150, 50, 'L', 150, 100, 'L', 50, 100, 'L', 50, 50, 'Z']
},
{
- 'selector' : '.polygon',
- 'path' : ['M', 50, 50, 'L', 100, 50, 'L', 100, 100, 'L', 50, 100, 'Z']
+ 'selector' : '.inset.padded',
+ 'path' : ['M', 30, 30, 'L', 120, 30, 'L', 120, 115, 'L', 30, 115, 'L', 30, 30, 'Z']
},
{
- 'selector' : '.rectangle.padded',
- 'path' : ['M', 75, 75, 'L', 175, 75, 'L', 175, 125, 'L', 75, 125, 'L', 75, 75, 'Z']
+ 'selector' : '.inset.padded.border-box',
+ 'path' : ['M', 50, 50, 'L', 150, 50, 'L', 150, 100, 'L', 50, 100, 'L', 50, 50, 'Z']
},
{
- 'selector' : '.rectangle.padded.border-box',
+ 'selector' : '.polygon',
+ 'path' : ['M', 50, 50, 'L', 150, 50, 'L', 150, 100, 'L', 50, 100, 'Z']
+ },
+ {
+ 'selector' : '.polygon.padded.border-box',
'path' : ['M', 50, 50, 'L', 150, 50, 'L', 150, 100, 'L', 50, 100, 'L', 50, 50, 'Z']
},
{
- 'selector' : '.vertical-lr > .rectangle',
+ 'selector' : '.vertical-lr > .inset',
'path' : ['M', 50, 50, 'L', 50, 100, 'L', 150, 100, 'L', 150, 50, 'L', 50, 50, 'Z']
},
{
- 'selector' : '.vertical-rl > .rectangle',
+ 'selector' : '.vertical-lr > .inset.padded',
+ 'path' : ['M', 30, 30, 'L', 30, 115, 'L', 120, 115, 'L', 120, 30, 'L', 30, 30, 'Z']
+ },
+ {
+ 'selector' : '.vertical-lr > .inset.padded.border-box',
+ 'path' : ['M', 50, 50, 'L', 50, 100, 'L', 150, 100, 'L', 150, 50, 'L', 50, 50, 'Z']
+ },
+ {
+ 'selector' : '.vertical-rl > .inset',
'path' : ['M', 150, 50, 'L', 150, 100, 'L', 50, 100, 'L', 50, 50, 'L', 150, 50, 'Z']
},
{
- 'selector' : '.vertical-rl > .rectangle.padded',
- 'path' : ['M', 175, 75, 'L', 175, 125, 'L', 75, 125, 'L', 75, 75, 'L', 175, 75, 'Z']
+ 'selector' : '.vertical-rl > .inset.padded',
+ 'path' : ['M', 120, 30, 'L', 120, 115, 'L', 30, 115, 'L', 30, 30, 'L', 120, 30, 'Z']
},
{
- 'selector' : '.vertical-rl > .rectangle.padded.border-box',
+ 'selector' : '.vertical-rl > .inset.padded.border-box',
'path' : ['M', 150, 50, 'L', 150, 100, 'L', 50, 100, 'L', 50, 50, 'L', 150, 50, 'Z']
},
{
@@ -108,9 +122,9 @@
function runNextTest(tests) {
var testcase = tests[0];
- InspectorTest.Shapes.getShapeOutsideInfo(testcase.selector, function(payload) {
- InspectorTest.Shapes.assertPathsAreRoughlyEqual(payload.shape, testcase.shape, "Shape information was not roughly equal.");
- InspectorTest.Shapes.assertPathsAreRoughlyEqual(payload.marginShape, testcase.marginShape, "Margin shape information was not roughly equal.");
+ InspectorTest.Shapes.getShapeOutsideInfoForSelector(testcase.selector, function(payload) {
+ if (!InspectorTest.Shapes.assertPathsAreRoughlyEqual(payload.shape, testcase.path, "Selector: \'" + testcase.selector + "\' Shape information was not roughly equal."))
+ InspectorTest.log("PASS: " + testcase.selector);
if (tests.length > 1)
runNextTest(tests.splice(1));
@@ -124,17 +138,20 @@
</script>
</head>
<body _onload_="runTest()">
- <div class='shape rectangle'></div>
+ <div class='shape inset'></div>
+ <div class='shape padded inset'></div>
+ <div class='shape padded inset border-box'></div>
<div class='shape polygon'></div>
- <div class='shape padded rectangle'></div>
- <div class='shape padded rectangle border-box'></div>
+ <div class='shape padded polygon border-box'></div>
<div class='vertical-lr'>
- <div class='shape rectangle'></div>
+ <div class='shape inset'></div>
+ <div class='shape padded inset'></div>
+ <div class='shape padded inset border-box'></div>
</div>
<div class='vertical-rl'>
- <div class='shape rectangle'></div>
- <div class='shape padded rectangle'></div>
- <div class='shape padded rectangle border-box'></div>
+ <div class='shape inset'></div>
+ <div class='shape padded inset'></div>
+ <div class='shape padded inset border-box'></div>
</div>
<div class='shape padded content-box'></div>
<div class='shape padded raster-svg'></div>
Modified: trunk/LayoutTests/inspector/dom/shapes-test.js (166672 => 166673)
--- trunk/LayoutTests/inspector/dom/shapes-test.js 2014-04-02 22:48:08 UTC (rev 166672)
+++ trunk/LayoutTests/inspector/dom/shapes-test.js 2014-04-02 23:06:36 UTC (rev 166673)
@@ -7,7 +7,6 @@
function requestDocumentCallback(node) {
InspectorTest.assert(node instanceof WebInspector.DOMNode, "Unexpected argument to requestDocument callback.")
-
DOMAgent.querySelector.invoke({nodeId: node.id, selector: selector}, querySelectorCallback);
}
@@ -84,7 +83,7 @@
var expectedPathString = makeStringForPath(expected);
var actualPathString = makeStringForPath(actual);
- var assertionMessage = message + " \nexpected: " + expectedPathString + "\n actual: " + actualPathString;
+ var assertionMessage = message + " \nEXPECTED: " + expectedPathString + "\n ACTUAL: " + actualPathString;
InspectorTest.assert(pathsAreRoughlyEqual(actual, expected), assertionMessage);
}
}
_______________________________________________ webkit-changes mailing list [email protected] https://lists.webkit.org/mailman/listinfo/webkit-changes
