<!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>[175631] 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/175631">175631</a></dd>
<dt>Author</dt> <dd>bjonesbe@adobe.com</dd>
<dt>Date</dt> <dd>2014-11-05 12:10:56 -0800 (Wed, 05 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] shape-image-threshold parsing tests have a few failures
https://bugs.webkit.org/show_bug.cgi?id=138060
Reviewed by Dirk Schulze.
Remove testing for inline style from the CSSWG test because it isn't
specified and isn't consistent across browsers. This has been updated
upstream as well.
Add inline style tests to the WebKit test suite to make sure that
WebKIt doesn't lose coverage with this change.
* TestExpectations:
* css3/shapes/shape-outside/values/shape-image-threshold-001-expected.txt:
* css3/shapes/shape-outside/values/shape-image-threshold-001.html:
* fast/shapes/parsing/parsing-shape-image-threshold-expected.txt:
* fast/shapes/parsing/parsing-shape-image-threshold.html:</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="#trunkLayoutTestscss3shapesshapeoutsidevaluesshapeimagethreshold001expectedtxt">trunk/LayoutTests/css3/shapes/shape-outside/values/shape-image-threshold-001-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3shapesshapeoutsidevaluesshapeimagethreshold001html">trunk/LayoutTests/css3/shapes/shape-outside/values/shape-image-threshold-001.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesparsingparsingshapeimagethresholdexpectedtxt">trunk/LayoutTests/fast/shapes/parsing/parsing-shape-image-threshold-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapesparsingparsingshapeimagethresholdhtml">trunk/LayoutTests/fast/shapes/parsing/parsing-shape-image-threshold.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (175630 => 175631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-11-05 20:09:26 UTC (rev 175630)
+++ trunk/LayoutTests/ChangeLog 2014-11-05 20:10:56 UTC (rev 175631)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-11-05 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ [CSS Shapes] shape-image-threshold parsing tests have a few failures
+ https://bugs.webkit.org/show_bug.cgi?id=138060
+
+ Reviewed by Dirk Schulze.
+
+ Remove testing for inline style from the CSSWG test because it isn't
+ specified and isn't consistent across browsers. This has been updated
+ upstream as well.
+
+ Add inline style tests to the WebKit test suite to make sure that
+ WebKIt doesn't lose coverage with this change.
+
+ * TestExpectations:
+ * css3/shapes/shape-outside/values/shape-image-threshold-001-expected.txt:
+ * css3/shapes/shape-outside/values/shape-image-threshold-001.html:
+ * fast/shapes/parsing/parsing-shape-image-threshold-expected.txt:
+ * fast/shapes/parsing/parsing-shape-image-threshold.html:
+
</ins><span class="cx"> 2014-11-05 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Stop special-casing the empty string in HTMLInputElement.type setter
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (175630 => 175631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2014-11-05 20:09:26 UTC (rev 175630)
+++ trunk/LayoutTests/TestExpectations 2014-11-05 20:10:56 UTC (rev 175631)
</span><span class="lines">@@ -158,8 +158,6 @@
</span><span class="cx"> webkit.org/b/137788 css3/shapes/shape-outside/shape-image/shape-image-010.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/137788 css3/shapes/shape-outside/shape-image/shape-image-024.html [ ImageOnlyFailure ]
</span><span class="cx">
</span><del>-webkit.org/b/138060 css3/shapes/shape-outside/values/shape-image-threshold-001.html [ Failure ]
-
</del><span class="cx"> # border painting diff (Path vs. drawLine)
</span><span class="cx"> webkit.org/b/136078 fast/borders/border-painting-dashed.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/136078 fast/borders/border-painting-dotted.html [ ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkLayoutTestscss3shapesshapeoutsidevaluesshapeimagethreshold001expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/shapes/shape-outside/values/shape-image-threshold-001-expected.txt (175630 => 175631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/shapes/shape-outside/values/shape-image-threshold-001-expected.txt 2014-11-05 20:09:26 UTC (rev 175630)
+++ trunk/LayoutTests/css3/shapes/shape-outside/values/shape-image-threshold-001-expected.txt 2014-11-05 20:10:56 UTC (rev 175631)
</span><span class="lines">@@ -1,8 +1,4 @@
</span><span class="cx">
</span><del>-PASS calc(10/100) - inline
-PASS calc(10/100 + 30/100) - inline
-PASS calc(150/100) - inline
-PASS calc(150/100 - 2) - inline
</del><span class="cx"> PASS calc(10/100) - computed
</span><span class="cx"> PASS calc(10/100 + 30/100) - computed
</span><span class="cx"> PASS calc(150/100) - computed
</span></span></pre></div>
<a id="trunkLayoutTestscss3shapesshapeoutsidevaluesshapeimagethreshold001html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/shapes/shape-outside/values/shape-image-threshold-001.html (175630 => 175631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/shapes/shape-outside/values/shape-image-threshold-001.html 2014-11-05 20:09:26 UTC (rev 175630)
+++ trunk/LayoutTests/css3/shapes/shape-outside/values/shape-image-threshold-001.html 2014-11-05 20:10:56 UTC (rev 175631)
</span><span class="lines">@@ -18,27 +18,21 @@
</span><span class="cx"> var shape_image_threshold_valid_tests = [
</span><span class="cx"> {
</span><span class="cx"> "actual": "calc(10/100)",
</span><del>- "expected_inline": "calc(0.1)",
</del><span class="cx"> "expected_computed": "0.1"
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "actual": "calc(10/100 + 30/100)",
</span><del>- "expected_inline": "calc(0.1 + 0.3)",
</del><span class="cx"> "expected_computed": "0.4"
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "actual": "calc(150/100)",
</span><del>- "expected_inline": "calc(1.5)",
</del><span class="cx"> "expected_computed": "1"
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "actual": "calc(150/100 - 2)",
</span><del>- "expected_inline": "calc(-0.5)",
</del><span class="cx"> "expected_computed": "0"
</span><span class="cx"> }
</span><span class="cx"> ];
</span><del>- generate_tests( ParsingUtils.testShapeThresholdInlineStyle,
- ParsingUtils.buildTestCases(shape_image_threshold_valid_tests, 'inline') );
</del><span class="cx"> generate_tests( ParsingUtils.testShapeThresholdComputedStyle,
</span><span class="cx"> ParsingUtils.buildTestCases(shape_image_threshold_valid_tests, 'computed') );
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeimagethresholdexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-image-threshold-expected.txt (175630 => 175631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-image-threshold-expected.txt 2014-11-05 20:09:26 UTC (rev 175630)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-image-threshold-expected.txt 2014-11-05 20:10:56 UTC (rev 175631)
</span><span class="lines">@@ -3,6 +3,14 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><ins>+PASS getCSSText("-webkit-shape-image-threshold", "0") is "0"
+PASS getCSSText("-webkit-shape-image-threshold", "0.5") is "0.5"
+PASS getCSSText("-webkit-shape-image-threshold", "1") is "1"
+PASS getCSSText("-webkit-shape-image-threshold", "-0.1") is "-0.1"
+PASS getCSSText("-webkit-shape-image-threshold", "1.1") is "1.1"
+PASS getCSSText("-webkit-shape-image-threshold", "identifier") is ""
+PASS getCSSText("-webkit-shape-image-threshold", "'string'") is ""
+PASS getCSSText("-webkit-shape-image-threshold", "calc(0.1 + 0.4)") is "calc(0.5)"
</ins><span class="cx"> PASS getComputedStyleValue("-webkit-shape-image-threshold", "0") is "0"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-image-threshold", "0.5") is "0.5"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-image-threshold", "1") is "1"
</span><span class="lines">@@ -10,6 +18,7 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-image-threshold", "1.1") is "1"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-image-threshold", "identifier") is "0"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-image-threshold", "'string'") is "0"
</span><ins>+PASS getComputedStyleValue("-webkit-shape-image-threshold", "calc(0.1 + 0.4)") is "0.5"
</ins><span class="cx"> PASS getChildComputedStyle("-webkit-shape-image-threshold", "0", "0") is "0"
</span><span class="cx"> PASS getChildComputedStyle("-webkit-shape-image-threshold", "0", "1") is "1"
</span><span class="cx"> PASS getChildComputedStyle("-webkit-shape-image-threshold", "1", "-1") is "0"
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeimagethresholdhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-image-threshold.html (175630 => 175631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-image-threshold.html 2014-11-05 20:09:26 UTC (rev 175630)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-image-threshold.html 2014-11-05 20:10:56 UTC (rev 175631)
</span><span class="lines">@@ -11,6 +11,20 @@
</span><span class="cx"> // The test functions and globals used here are defined parsing-test-utils.js.
</span><span class="cx">
</span><span class="cx"> applyToEachArglist(
</span><ins>+ testShapeSpecifiedProperty,
+ [// [property, value, expectedValue]
+ ["-webkit-shape-image-threshold", "0", "0"],
+ ["-webkit-shape-image-threshold", "0.5", "0.5"],
+ ["-webkit-shape-image-threshold", "1", "1"],
+ ["-webkit-shape-image-threshold", "-0.1", "-0.1"],
+ ["-webkit-shape-image-threshold", "1.1", "1.1"],
+ ["-webkit-shape-image-threshold", "identifier", ""],
+ ["-webkit-shape-image-threshold", "\'string\'", ""],
+ ["-webkit-shape-image-threshold", "calc(0.1 + 0.4)", "calc(0.5)"]
+ ]
+);
+
+applyToEachArglist(
</ins><span class="cx"> testShapeComputedProperty,
</span><span class="cx"> [// [property, value, expectedValue]
</span><span class="cx"> ["-webkit-shape-image-threshold", "0", "0"],
</span><span class="lines">@@ -19,7 +33,8 @@
</span><span class="cx"> ["-webkit-shape-image-threshold", "-0.1", "0"],
</span><span class="cx"> ["-webkit-shape-image-threshold", "1.1", "1"],
</span><span class="cx"> ["-webkit-shape-image-threshold", "identifier", "0"],
</span><del>- ["-webkit-shape-image-threshold", "\'string\'", "0"]
</del><ins>+ ["-webkit-shape-image-threshold", "\'string\'", "0"],
+ ["-webkit-shape-image-threshold", "calc(0.1 + 0.4)", "0.5"]
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>