<!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>[176171] 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/176171">176171</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-11-16 21:41:05 -0800 (Sun, 16 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash when setting 'order' CSS property to a calculated value
https://bugs.webkit.org/show_bug.cgi?id=138780
Reviewed by Darin Adler.
Source/WebCore:
CSS Calculated values were not handled by the CSS parser for 'order'
CSS property. As a result, using calculated values wouldn't work in
release builds and would hit an assertion in debug builds.
This patch updates the CSS parser to directly convert the
CSS Calculated value into a simple integer CSSPrimitiveValue for
'order' property. We could have marked CSS Calculated values as
valid in the CSS Parser instead but this would have brought issues:
- The calculated value needs to be adjusted to INT_MIN + 2 if it is less
than that. This would force us to calculate the expression anyway.
- The StyleBuilder would need updating to properly handle CSS Calculated
values for 'order'.
Test: fast/css/order-calculated-value.html
* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue):
LayoutTests:
Add a layout test to validate that setting a calculated value to the
'order' CSS property does not crash and behaves as expected.
* fast/css/order-calculated-value-expected.txt: Added.
* fast/css/order-calculated-value.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssordercalculatedvalueexpectedtxt">trunk/LayoutTests/fast/css/order-calculated-value-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssordercalculatedvaluehtml">trunk/LayoutTests/fast/css/order-calculated-value.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (176170 => 176171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-11-17 05:38:05 UTC (rev 176170)
+++ trunk/LayoutTests/ChangeLog 2014-11-17 05:41:05 UTC (rev 176171)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-11-16 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Crash when setting 'order' CSS property to a calculated value
+ https://bugs.webkit.org/show_bug.cgi?id=138780
+
+ Reviewed by Darin Adler.
+
+ Add a layout test to validate that setting a calculated value to the
+ 'order' CSS property does not crash and behaves as expected.
+
+ * fast/css/order-calculated-value-expected.txt: Added.
+ * fast/css/order-calculated-value.html: Added.
+
+2014-11-16 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Assertion hit when setting a very large value to 'border-width' / 'font-size' CSS properties
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=138770
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssordercalculatedvalueexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/order-calculated-value-expected.txt (0 => 176171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/order-calculated-value-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/order-calculated-value-expected.txt 2014-11-17 05:41:05 UTC (rev 176171)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+Tests assigning a calculated value to 'order' CSS property.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS testDiv.style['order'] is ""
+testDiv.style['order'] = 'calc(2 * 3)'
+PASS testDiv.style['order'] is "6"
+PASS window.getComputedStyle(testDiv).getPropertyValue('order') is "6"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssordercalculatedvaluehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/order-calculated-value.html (0 => 176171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/order-calculated-value.html (rev 0)
+++ trunk/LayoutTests/fast/css/order-calculated-value.html 2014-11-17 05:41:05 UTC (rev 176171)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<div id="testDiv"></div>
+<script>
+description("Tests assigning a calculated value to 'order' CSS property.");
+
+var testDiv = document.getElementById("testDiv");
+
+shouldBeEmptyString("testDiv.style['order']");
+evalAndLog("testDiv.style['order'] = 'calc(2 * 3)'");
+shouldBeEqualToString("testDiv.style['order']", "6");
+shouldBeEqualToString("window.getComputedStyle(testDiv).getPropertyValue('order')", "6");
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176170 => 176171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-17 05:38:05 UTC (rev 176170)
+++ trunk/Source/WebCore/ChangeLog 2014-11-17 05:41:05 UTC (rev 176171)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2014-11-16 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Crash when setting 'order' CSS property to a calculated value
+ https://bugs.webkit.org/show_bug.cgi?id=138780
+
+ Reviewed by Darin Adler.
+
+ CSS Calculated values were not handled by the CSS parser for 'order'
+ CSS property. As a result, using calculated values wouldn't work in
+ release builds and would hit an assertion in debug builds.
+
+ This patch updates the CSS parser to directly convert the
+ CSS Calculated value into a simple integer CSSPrimitiveValue for
+ 'order' property. We could have marked CSS Calculated values as
+ valid in the CSS Parser instead but this would have brought issues:
+ - The calculated value needs to be adjusted to INT_MIN + 2 if it is less
+ than that. This would force us to calculate the expression anyway.
+ - The StyleBuilder would need updating to properly handle CSS Calculated
+ values for 'order'.
+
+ Test: fast/css/order-calculated-value.html
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+
+2014-11-16 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Assertion hit when setting a very large value to 'border-width' / 'font-size' CSS properties
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=138770
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (176170 => 176171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-11-17 05:38:05 UTC (rev 176170)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-11-17 05:41:05 UTC (rev 176171)
</span><span class="lines">@@ -2504,7 +2504,8 @@
</span><span class="cx"> case CSSPropertyOrder:
</span><span class="cx"> if (validUnit(value, FInteger, CSSStrictMode)) {
</span><span class="cx"> // We restrict the smallest value to int min + 2 because we use int min and int min + 1 as special values in a hash set.
</span><del>- parsedValue = cssValuePool().createValue(std::max<double>(std::numeric_limits<int>::min() + 2, value->fValue), static_cast<CSSPrimitiveValue::UnitTypes>(value->unit));
</del><ins>+ double result = std::max<double>(std::numeric_limits<int>::min() + 2, parsedDouble(value, ReleaseParsedCalcValue));
+ parsedValue = cssValuePool().createValue(result, CSSPrimitiveValue::CSS_NUMBER);
</ins><span class="cx"> m_valueList->next();
</span><span class="cx"> }
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>