<!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>[172757] trunk</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/172757">172757</a></dd>
<dt>Author</dt> <dd>bjonesbe@adobe.com</dd>
<dt>Date</dt> <dd>2014-08-19 13:41:08 -0700 (Tue, 19 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] A few calc() test failures in the shape-image-threshold parsing tests
https://bugs.webkit.org/show_bug.cgi?id=135926
Reviewed by Dirk Schulze.
Source/WebCore:
shape-image-threshold is a Number, so it should be parsed as one. The
default parsing doesn't support calcs, but numbers do.
No new tests, fixes exitsing test to pass.
* css/DeprecatedStyleBuilder.cpp:
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder): Use
ApplyPropertyNumber instead of ApplyPropertyDefault for
shape-image-threshold.
LayoutTests:
* TestExpectations: Remove Failure and Crash expectations.
* css3/shapes/shape-outside/values/shape-image-threshold-001-expected.txt:
Proper expected results now that the test passes.
* css3/shapes/shape-outside/values/shape-image-threshold-001.html:
Adding together calcs isn't valid, so move the addition inside of
the calc expression. This will also be updated upstream.</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="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedStyleBuildercpp">trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (172756 => 172757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-08-19 18:57:58 UTC (rev 172756)
+++ trunk/LayoutTests/ChangeLog 2014-08-19 20:41:08 UTC (rev 172757)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-08-19 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ [CSS Shapes] A few calc() test failures in the shape-image-threshold parsing tests
+ https://bugs.webkit.org/show_bug.cgi?id=135926
+
+ Reviewed by Dirk Schulze.
+
+ * TestExpectations: Remove Failure and Crash expectations.
+ * css3/shapes/shape-outside/values/shape-image-threshold-001-expected.txt:
+ Proper expected results now that the test passes.
+ * css3/shapes/shape-outside/values/shape-image-threshold-001.html:
+ Adding together calcs isn't valid, so move the addition inside of
+ the calc expression. This will also be updated upstream.
+
</ins><span class="cx"> 2014-08-19 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED on css3/shapes/shape-outside/values/shape-image-threshold-001.html
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (172756 => 172757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2014-08-19 18:57:58 UTC (rev 172756)
+++ trunk/LayoutTests/TestExpectations 2014-08-19 20:41:08 UTC (rev 172757)
</span><span class="lines">@@ -154,8 +154,6 @@
</span><span class="cx"> webkit.org/b/135925 css3/shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-014.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/135925 css3/shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-015.html [ ImageOnlyFailure ]
</span><span class="cx">
</span><del>-webkit.org/b/135926 css3/shapes/shape-outside/values/shape-image-threshold-001.html [ Failure ]
-
</del><span class="cx"> webkit.org/b/135927 css3/shapes/spec-examples/shape-outside-010.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/135927 css3/shapes/spec-examples/shape-outside-011.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/135927 css3/shapes/spec-examples/shape-outside-012.html [ ImageOnlyFailure ]
</span><span class="lines">@@ -166,7 +164,3 @@
</span><span class="cx"> webkit.org/b/135927 css3/shapes/spec-examples/shape-outside-017.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/135927 css3/shapes/spec-examples/shape-outside-018.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/135927 css3/shapes/spec-examples/shape-outside-019.html [ ImageOnlyFailure ]
</span><del>-
-[ Debug ] css3/shapes/shape-outside/values/shape-image-threshold-001.html [ Crash ]
-
-webkit.org/b/136075 [ Debug ] css3/shapes/shape-outside/values/shape-image-threshold-001.html [ Skip ]
</del></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 (172756 => 172757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/shapes/shape-outside/values/shape-image-threshold-001-expected.txt 2014-08-19 18:57:58 UTC (rev 172756)
+++ trunk/LayoutTests/css3/shapes/shape-outside/values/shape-image-threshold-001-expected.txt 2014-08-19 20:41:08 UTC (rev 172757)
</span><span class="lines">@@ -1 +1,10 @@
</span><del>-PASS
</del><span class="cx">\ No newline at end of file
</span><ins>+
+PASS calc(10/100) - inline
+PASS calc(10/100 + 30/100) - inline
+PASS calc(150/100) - inline
+PASS calc(150/100 - 2) - inline
+PASS calc(10/100) - computed
+PASS calc(10/100 + 30/100) - computed
+PASS calc(150/100) - computed
+PASS calc(150/100 - 2) - computed
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3shapesshapeoutsidevaluesshapeimagethreshold001html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/shapes/shape-outside/values/shape-image-threshold-001.html (172756 => 172757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/shapes/shape-outside/values/shape-image-threshold-001.html 2014-08-19 18:57:58 UTC (rev 172756)
+++ trunk/LayoutTests/css3/shapes/shape-outside/values/shape-image-threshold-001.html 2014-08-19 20:41:08 UTC (rev 172757)
</span><span class="lines">@@ -22,8 +22,8 @@
</span><span class="cx"> "expected_computed": "0.1"
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "actual": "calc(10/100) + calc(30/100)",
- "expected_inline": "calc(0.1) + calc(0.3)",
</del><ins>+ "actual": "calc(10/100 + 30/100)",
+ "expected_inline": "calc(0.4)",
</ins><span class="cx"> "expected_computed": "0.4"
</span><span class="cx"> },
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172756 => 172757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-19 18:57:58 UTC (rev 172756)
+++ trunk/Source/WebCore/ChangeLog 2014-08-19 20:41:08 UTC (rev 172757)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-08-19 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ [CSS Shapes] A few calc() test failures in the shape-image-threshold parsing tests
+ https://bugs.webkit.org/show_bug.cgi?id=135926
+
+ Reviewed by Dirk Schulze.
+
+ shape-image-threshold is a Number, so it should be parsed as one. The
+ default parsing doesn't support calcs, but numbers do.
+
+ No new tests, fixes exitsing test to pass.
+
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder): Use
+ ApplyPropertyNumber instead of ApplyPropertyDefault for
+ shape-image-threshold.
+
</ins><span class="cx"> 2014-08-18 Maciej Stachowiak <mjs@apple.com>
</span><span class="cx">
</span><span class="cx"> Use NSURLFileTypeMappings directly instead of depending on WebKitSystemInterface wrappers for it
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (172756 => 172757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-08-19 18:57:58 UTC (rev 172756)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-08-19 20:41:08 UTC (rev 172757)
</span><span class="lines">@@ -2582,7 +2582,7 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitClipPath, ApplyPropertyClipPath<&RenderStyle::clipPath, &RenderStyle::setClipPath, &RenderStyle::initialClipPath>::createHandler());
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitShapeMargin, ApplyPropertyLength<&RenderStyle::shapeMargin, &RenderStyle::setShapeMargin, &RenderStyle::initialShapeMargin>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitShapeImageThreshold, ApplyPropertyDefault<float, &RenderStyle::shapeImageThreshold, float, &RenderStyle::setShapeImageThreshold, float, &RenderStyle::initialShapeImageThreshold>::createHandler());
</del><ins>+ setPropertyHandler(CSSPropertyWebkitShapeImageThreshold, ApplyPropertyNumber<float, &RenderStyle::shapeImageThreshold, &RenderStyle::setShapeImageThreshold, &RenderStyle::initialShapeImageThreshold>::createHandler());
</ins><span class="cx"> setPropertyHandler(CSSPropertyWebkitShapeOutside, ApplyPropertyShape<&RenderStyle::shapeOutside, &RenderStyle::setShapeOutside, &RenderStyle::initialShapeOutside>::createHandler());
</span><span class="cx"> #endif
</span><span class="cx"> setPropertyHandler(CSSPropertyWhiteSpace, ApplyPropertyDefault<EWhiteSpace, &RenderStyle::whiteSpace, EWhiteSpace, &RenderStyle::setWhiteSpace, EWhiteSpace, &RenderStyle::initialWhiteSpace>::createHandler());
</span></span></pre>
</div>
</div>
</body>
</html>