<!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>[178102] 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/178102">178102</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-07 21:56:27 -0800 (Wed, 07 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Assert should never be reached hit in WebCore::CSSCalcPrimitiveValue::doubleValue
https://bugs.webkit.org/show_bug.cgi?id=140180
Reviewed by Darin Adler.
Source/WebCore:
Add support for using floating-point angles with 'turn' unit, as per the
specification:
http://dev.w3.org/csswg/css-values-3/#angles
Previously, we only supported integer values for the 'turn' unit even
though other angle units (e.g. 'deg') handle floating-point values just
fine. Trying to use a floating-point value with 'turn' unit would cause
us to hit an assertion in CSSCalcPrimitiveValue::doubleValue().
Also fix the support for angles in calc().
CSSPrimitiveValue::computeDegrees() was accessing m_primitiveUnitType
member directly, which would be incorrect in the case of calculated
values. This patch switches to calling CSSPrimitiveValue::primitiveType()
which handles calculated values.
Test: fast/css/turn-angle-double.html
* css/CSSCalculationValue.cpp:
(WebCore::hasDoubleValue):
* css/CSSPrimitiveValue.cpp:
(WebCore::CSSPrimitiveValue::computeDegrees):
LayoutTests:
Add a layout test to make sure that using float-point angles with 'turn' unit
does not crash and behaves as intended. Also cover the case where calc() is
used.
* fast/css/turn-angle-double-expected.txt: Added.
* fast/css/turn-angle-double.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="#trunkSourceWebCorecssCSSCalculationValuecpp">trunk/Source/WebCore/css/CSSCalculationValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValuecpp">trunk/Source/WebCore/css/CSSPrimitiveValue.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssturnangledoubleexpectedtxt">trunk/LayoutTests/fast/css/turn-angle-double-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssturnangledoublehtml">trunk/LayoutTests/fast/css/turn-angle-double.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (178101 => 178102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-08 05:36:59 UTC (rev 178101)
+++ trunk/LayoutTests/ChangeLog 2015-01-08 05:56:27 UTC (rev 178102)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-01-07 Chris Dumez <cdumez@apple.com>
+
+ Assert should never be reached hit in WebCore::CSSCalcPrimitiveValue::doubleValue
+ https://bugs.webkit.org/show_bug.cgi?id=140180
+
+ Reviewed by Darin Adler.
+
+ Add a layout test to make sure that using float-point angles with 'turn' unit
+ does not crash and behaves as intended. Also cover the case where calc() is
+ used.
+
+ * fast/css/turn-angle-double-expected.txt: Added.
+ * fast/css/turn-angle-double.html: Added.
+
</ins><span class="cx"> 2015-01-07 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> The ASCII decoding for non ASCII character is incorrect if this character comes after going through the fast decoding code path and before the end of the text by less than a machine word size of characters.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssturnangledoubleexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/turn-angle-double-expected.txt (0 => 178102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/turn-angle-double-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/turn-angle-double-expected.txt 2015-01-08 05:56:27 UTC (rev 178102)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+Tests using floating-point angles with 'turn' unit.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS testDiv.style['-webkit-transform'] is ""
+testDiv.style['-webkit-transform'] = 'rotate(0.5turn)'
+PASS testDiv.style['-webkit-transform'] is "rotate(0.5turn)"
+testDiv.style['-webkit-transform'] = 'rotate(calc(2turn * 1.5))'
+PASS testDiv.style['-webkit-transform'] is "rotate(calc(3turn))"
+testDiv.style['-webkit-transform'] = 'rotate(calc(1turn * 2 + 2.5deg))'
+PASS testDiv.style['-webkit-transform'] is "rotate(calc(722.5deg))"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssturnangledoublehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/turn-angle-double.html (0 => 178102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/turn-angle-double.html (rev 0)
+++ trunk/LayoutTests/fast/css/turn-angle-double.html 2015-01-08 05:56:27 UTC (rev 178102)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<div id="testDiv" style="position: absolute;"></div>
+<script>
+description("Tests using floating-point angles with 'turn' unit.");
+
+var testDiv = document.getElementById("testDiv");
+
+// -webkit-transform:rotate(0deg);
+shouldBeEmptyString("testDiv.style['-webkit-transform']");
+evalAndLog("testDiv.style['-webkit-transform'] = 'rotate(0.5turn)'");
+shouldBeEqualToString("testDiv.style['-webkit-transform']", "rotate(0.5turn)");
+
+evalAndLog("testDiv.style['-webkit-transform'] = 'rotate(calc(2turn * 1.5))'");
+shouldBeEqualToString("testDiv.style['-webkit-transform']", "rotate(calc(3turn))");
+
+evalAndLog("testDiv.style['-webkit-transform'] = 'rotate(calc(1turn * 2 + 2.5deg))'");
+shouldBeEqualToString("testDiv.style['-webkit-transform']", "rotate(calc(722.5deg))");
+
+</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 (178101 => 178102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-08 05:36:59 UTC (rev 178101)
+++ trunk/Source/WebCore/ChangeLog 2015-01-08 05:56:27 UTC (rev 178102)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2015-01-07 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Assert should never be reached hit in WebCore::CSSCalcPrimitiveValue::doubleValue
+ https://bugs.webkit.org/show_bug.cgi?id=140180
+
+ Reviewed by Darin Adler.
+
+ Add support for using floating-point angles with 'turn' unit, as per the
+ specification:
+ http://dev.w3.org/csswg/css-values-3/#angles
+
+ Previously, we only supported integer values for the 'turn' unit even
+ though other angle units (e.g. 'deg') handle floating-point values just
+ fine. Trying to use a floating-point value with 'turn' unit would cause
+ us to hit an assertion in CSSCalcPrimitiveValue::doubleValue().
+
+ Also fix the support for angles in calc().
+ CSSPrimitiveValue::computeDegrees() was accessing m_primitiveUnitType
+ member directly, which would be incorrect in the case of calculated
+ values. This patch switches to calling CSSPrimitiveValue::primitiveType()
+ which handles calculated values.
+
+ Test: fast/css/turn-angle-double.html
+
+ * css/CSSCalculationValue.cpp:
+ (WebCore::hasDoubleValue):
+ * css/CSSPrimitiveValue.cpp:
+ (WebCore::CSSPrimitiveValue::computeDegrees):
+
+2015-01-07 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Move 'font' CSS property to the new StyleBuilder
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=140181
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCalculationValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCalculationValue.cpp (178101 => 178102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCalculationValue.cpp 2015-01-08 05:36:59 UTC (rev 178101)
+++ trunk/Source/WebCore/css/CSSCalculationValue.cpp 2015-01-08 05:56:27 UTC (rev 178102)
</span><span class="lines">@@ -109,6 +109,7 @@
</span><span class="cx"> case CSSPrimitiveValue::CSS_DEG:
</span><span class="cx"> case CSSPrimitiveValue::CSS_RAD:
</span><span class="cx"> case CSSPrimitiveValue::CSS_GRAD:
</span><ins>+ case CSSPrimitiveValue::CSS_TURN:
</ins><span class="cx"> case CSSPrimitiveValue::CSS_MS:
</span><span class="cx"> case CSSPrimitiveValue::CSS_S:
</span><span class="cx"> case CSSPrimitiveValue::CSS_HZ:
</span><span class="lines">@@ -135,7 +136,6 @@
</span><span class="cx"> case CSSPrimitiveValue::CSS_PARSER_OPERATOR:
</span><span class="cx"> case CSSPrimitiveValue::CSS_PARSER_HEXCOLOR:
</span><span class="cx"> case CSSPrimitiveValue::CSS_PARSER_IDENTIFIER:
</span><del>- case CSSPrimitiveValue::CSS_TURN:
</del><span class="cx"> case CSSPrimitiveValue::CSS_COUNTER_NAME:
</span><span class="cx"> case CSSPrimitiveValue::CSS_SHAPE:
</span><span class="cx"> case CSSPrimitiveValue::CSS_QUAD:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (178101 => 178102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2015-01-08 05:36:59 UTC (rev 178101)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2015-01-08 05:56:27 UTC (rev 178102)
</span><span class="lines">@@ -536,7 +536,7 @@
</span><span class="cx">
</span><span class="cx"> double CSSPrimitiveValue::computeDegrees()
</span><span class="cx"> {
</span><del>- switch (m_primitiveUnitType) {
</del><ins>+ switch (primitiveType()) {
</ins><span class="cx"> case CSS_DEG:
</span><span class="cx"> return getDoubleValue();
</span><span class="cx"> case CSS_RAD:
</span></span></pre>
</div>
</div>
</body>
</html>