<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[166673] trunk/LayoutTests</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/166673">166673</a></dd>
<dt>Author</dt> <dd>zoltan@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-02 16:06:36 -0700 (Wed, 02 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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.):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsinspectordomhighlightshapeoutsideexpectedtxt">trunk/LayoutTests/inspector/dom/highlight-shape-outside-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectordomhighlightshapeoutsidehtml">trunk/LayoutTests/inspector/dom/highlight-shape-outside.html</a></li>
<li><a href="#trunkLayoutTestsinspectordomshapestestjs">trunk/LayoutTests/inspector/dom/shapes-test.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166672 => 166673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-02 22:48:08 UTC (rev 166672)
+++ trunk/LayoutTests/ChangeLog 2014-04-02 23:06:36 UTC (rev 166673)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-04-02 Zoltan Horvath <zoltan@webkit.org>
+
+ [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.):
+
</ins><span class="cx"> 2014-04-02 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Improve ARIA live region reliability by sending notifications when live regions are created/shown and hidden/destroyed
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (166672 => 166673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2014-04-02 22:48:08 UTC (rev 166672)
+++ trunk/LayoutTests/TestExpectations 2014-04-02 23:06:36 UTC (rev 166673)
</span><span class="lines">@@ -49,7 +49,6 @@
</span><span class="cx"> fast/mediastream/MediaStream-construct-with-ended-tracks.html [ Skip ]
</span><span class="cx"> fast/mediastream/MediaStream-clone.html [ Skip ]
</span><span class="cx">
</span><del>-webkit.org/b/124660 inspector/dom/highlight-shape-outside.html [ Failure ]
</del><span class="cx"> webkit.org/b/126519 inspector/dom/highlight-shape-outside-margin.html [ Failure ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/126142 css3/calc/transitions-dependent.html [ Pass Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomhighlightshapeoutsideexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom/highlight-shape-outside-expected.txt (166672 => 166673)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,13 +1,16 @@
</span><del>-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]
</del><ins>+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
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomhighlightshapeoutsidehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom/highlight-shape-outside.html (166672 => 166673)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -9,14 +9,13 @@
</span><span class="cx"> width: 200px;
</span><span class="cx"> height: 200px;
</span><span class="cx"> margin-right: -200px;
</span><ins>+ box-sizing: border-box;
</ins><span class="cx"> }
</span><span class="cx"> .padded {
</span><del>- width: 100px;
- height: 100px;
</del><span class="cx"> padding: 25px 75px 75px 25px;
</span><span class="cx"> }
</span><del>-.border-box {
- box-sizing: border-box;
</del><ins>+.vertical-lr, .vertical-rl {
+ float: left;
</ins><span class="cx"> }
</span><span class="cx"> .vertical-lr {
</span><span class="cx"> -webkit-writing-mode: vertical-lr;
</span><span class="lines">@@ -24,17 +23,20 @@
</span><span class="cx"> .vertical-rl {
</span><span class="cx"> -webkit-writing-mode: vertical-rl;
</span><span class="cx"> }
</span><del>-.rectangle {
- -webkit-shape-outside: rectangle(50px, 50px, 100px, 50px) content-box;
</del><ins>+.inset {
+ -webkit-shape-outside: inset(50px 50px 100px 50px) content-box;
</ins><span class="cx"> }
</span><del>-.rectangle.border-box {
- -webkit-shape-outside: rectangle(50px, 50px, 100px, 50px) border-box;
</del><ins>+.inset.padded {
+ -webkit-shape-outside: inset(5px 5px 10px 5px) content-box;
</ins><span class="cx"> }
</span><ins>+.inset.padded.border-box {
+ -webkit-shape-outside: inset(50px 50px 100px 50px) border-box;
+}
</ins><span class="cx"> .polygon {
</span><del>- -webkit-shape-outside: polygon(50px 50px, 100px 50px, 100px 100px, 50px 100px) content-box;
</del><ins>+ -webkit-shape-outside: polygon(50px 50px, 150px 50px, 150px 100px, 50px 100px) content-box;
</ins><span class="cx"> }
</span><span class="cx"> .polygon.border-box {
</span><del>- -webkit-shape-outside: polygon(50px 50px, 100px 50px, 100px 100px, 50px 100px) border-box;
</del><ins>+ -webkit-shape-outside: polygon(50px 50px, 150px 50px, 150px 100px, 50px 100px) border-box;
</ins><span class="cx"> }
</span><span class="cx"> .content-box {
</span><span class="cx"> -webkit-shape-outside: content-box;
</span><span class="lines">@@ -56,35 +58,47 @@
</span><span class="cx"> function test() {
</span><span class="cx"> var testcases = [
</span><span class="cx"> {
</span><del>- 'selector' : '.rectangle',
</del><ins>+ 'selector' : '.inset',
</ins><span class="cx"> 'path' : ['M', 50, 50, 'L', 150, 50, 'L', 150, 100, 'L', 50, 100, 'L', 50, 50, 'Z']
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- 'selector' : '.polygon',
- 'path' : ['M', 50, 50, 'L', 100, 50, 'L', 100, 100, 'L', 50, 100, 'Z']
</del><ins>+ 'selector' : '.inset.padded',
+ 'path' : ['M', 30, 30, 'L', 120, 30, 'L', 120, 115, 'L', 30, 115, 'L', 30, 30, 'Z']
</ins><span class="cx"> },
</span><span class="cx"> {
</span><del>- 'selector' : '.rectangle.padded',
- 'path' : ['M', 75, 75, 'L', 175, 75, 'L', 175, 125, 'L', 75, 125, 'L', 75, 75, 'Z']
</del><ins>+ 'selector' : '.inset.padded.border-box',
+ 'path' : ['M', 50, 50, 'L', 150, 50, 'L', 150, 100, 'L', 50, 100, 'L', 50, 50, 'Z']
</ins><span class="cx"> },
</span><span class="cx"> {
</span><del>- 'selector' : '.rectangle.padded.border-box',
</del><ins>+ 'selector' : '.polygon',
+ 'path' : ['M', 50, 50, 'L', 150, 50, 'L', 150, 100, 'L', 50, 100, 'Z']
+ },
+ {
+ 'selector' : '.polygon.padded.border-box',
</ins><span class="cx"> 'path' : ['M', 50, 50, 'L', 150, 50, 'L', 150, 100, 'L', 50, 100, 'L', 50, 50, 'Z']
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- 'selector' : '.vertical-lr > .rectangle',
</del><ins>+ 'selector' : '.vertical-lr > .inset',
</ins><span class="cx"> 'path' : ['M', 50, 50, 'L', 50, 100, 'L', 150, 100, 'L', 150, 50, 'L', 50, 50, 'Z']
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- 'selector' : '.vertical-rl > .rectangle',
</del><ins>+ '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',
</ins><span class="cx"> 'path' : ['M', 150, 50, 'L', 150, 100, 'L', 50, 100, 'L', 50, 50, 'L', 150, 50, 'Z']
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- 'selector' : '.vertical-rl > .rectangle.padded',
- 'path' : ['M', 175, 75, 'L', 175, 125, 'L', 75, 125, 'L', 75, 75, 'L', 175, 75, 'Z']
</del><ins>+ 'selector' : '.vertical-rl > .inset.padded',
+ 'path' : ['M', 120, 30, 'L', 120, 115, 'L', 30, 115, 'L', 30, 30, 'L', 120, 30, 'Z']
</ins><span class="cx"> },
</span><span class="cx"> {
</span><del>- 'selector' : '.vertical-rl > .rectangle.padded.border-box',
</del><ins>+ 'selector' : '.vertical-rl > .inset.padded.border-box',
</ins><span class="cx"> 'path' : ['M', 150, 50, 'L', 150, 100, 'L', 50, 100, 'L', 50, 50, 'L', 150, 50, 'Z']
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="lines">@@ -108,9 +122,9 @@
</span><span class="cx"> function runNextTest(tests) {
</span><span class="cx"> var testcase = tests[0];
</span><span class="cx">
</span><del>- 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.");
</del><ins>+ 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);
</ins><span class="cx">
</span><span class="cx"> if (tests.length > 1)
</span><span class="cx"> runNextTest(tests.splice(1));
</span><span class="lines">@@ -124,17 +138,20 @@
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx"> <body onload="runTest()">
</span><del>- <div class='shape rectangle'></div>
</del><ins>+ <div class='shape inset'></div>
+ <div class='shape padded inset'></div>
+ <div class='shape padded inset border-box'></div>
</ins><span class="cx"> <div class='shape polygon'></div>
</span><del>- <div class='shape padded rectangle'></div>
- <div class='shape padded rectangle border-box'></div>
</del><ins>+ <div class='shape padded polygon border-box'></div>
</ins><span class="cx"> <div class='vertical-lr'>
</span><del>- <div class='shape rectangle'></div>
</del><ins>+ <div class='shape inset'></div>
+ <div class='shape padded inset'></div>
+ <div class='shape padded inset border-box'></div>
</ins><span class="cx"> </div>
</span><span class="cx"> <div class='vertical-rl'>
</span><del>- <div class='shape rectangle'></div>
- <div class='shape padded rectangle'></div>
- <div class='shape padded rectangle border-box'></div>
</del><ins>+ <div class='shape inset'></div>
+ <div class='shape padded inset'></div>
+ <div class='shape padded inset border-box'></div>
</ins><span class="cx"> </div>
</span><span class="cx"> <div class='shape padded content-box'></div>
</span><span class="cx"> <div class='shape padded raster-svg'></div>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomshapestestjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom/shapes-test.js (166672 => 166673)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -7,7 +7,6 @@
</span><span class="cx">
</span><span class="cx"> function requestDocumentCallback(node) {
</span><span class="cx"> InspectorTest.assert(node instanceof WebInspector.DOMNode, "Unexpected argument to requestDocument callback.")
</span><del>-
</del><span class="cx"> DOMAgent.querySelector.invoke({nodeId: node.id, selector: selector}, querySelectorCallback);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -84,7 +83,7 @@
</span><span class="cx">
</span><span class="cx"> var expectedPathString = makeStringForPath(expected);
</span><span class="cx"> var actualPathString = makeStringForPath(actual);
</span><del>- var assertionMessage = message + " \nexpected: " + expectedPathString + "\n actual: " + actualPathString;
</del><ins>+ var assertionMessage = message + " \nEXPECTED: " + expectedPathString + "\n ACTUAL: " + actualPathString;
</ins><span class="cx"> InspectorTest.assert(pathsAreRoughlyEqual(actual, expected), assertionMessage);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>