<!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>[168685] 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/168685">168685</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-13 10:08:43 -0700 (Tue, 13 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED: leftCategory != CalcOther && rightCategory != CalcOther
in WebCore::CSSCalcBinaryOperation::createSimplified
https://bugs.webkit.org/show_bug.cgi?id=132870
Source/WebCore:
According to the standard, calc() should be able to handle angle, time
and frequency values as well: http://www.w3.org/TR/css3-values/#calc
Patch by Martin Hodovan <mhodovan.u-szeged@partner.samsung.com> on 2014-05-13
Reviewed by Darin Adler.
Test: fast/css/calc-with-angle-time-frequency.html
* css/CSSCalculationValue.cpp:
(WebCore::unitCategory):
(WebCore::CSSCalcPrimitiveValue::createCalcExpression):
(WebCore::CSSCalcPrimitiveValue::computeLengthPx):
(WebCore::CSSCalcPrimitiveValue::addSubtractResult):
(WebCore::CSSCalcPrimitiveValue::determineCategory):
(WebCore::CSSCalcBinaryOperation::primitiveType)
* css/CSSCalculationValue.h: extending CalculationCategory
* css/CSSParser.cpp:
(WebCore::CSSParser::validCalculationUnit):
* css/CSSPrimitiveValue.cpp:
(WebCore::CSSPrimitiveValue::primitiveType):
LayoutTests:
Added test contains calc() expressions with angle, time and frequency values,
covering all the newly introduced unit types, each of which used to fail.
Patch by Martin Hodovan <mhodovan.u-szeged@partner.samsung.com> on 2014-05-13
Reviewed by Darin Adler.
* fast/css/calc-with-angle-time-frequency-expected.txt: Added.
* fast/css/calc-with-angle-time-frequency.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="#trunkSourceWebCorecssCSSCalculationValueh">trunk/Source/WebCore/css/CSSCalculationValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValuecpp">trunk/Source/WebCore/css/CSSPrimitiveValue.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcsscalcwithangletimefrequencyexpectedtxt">trunk/LayoutTests/fast/css/calc-with-angle-time-frequency-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcsscalcwithangletimefrequencyhtml">trunk/LayoutTests/fast/css/calc-with-angle-time-frequency.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (168684 => 168685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-13 16:26:16 UTC (rev 168684)
+++ trunk/LayoutTests/ChangeLog 2014-05-13 17:08:43 UTC (rev 168685)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-05-13 Martin Hodovan <mhodovan.u-szeged@partner.samsung.com>
+
+ ASSERTION FAILED: leftCategory != CalcOther && rightCategory != CalcOther
+ in WebCore::CSSCalcBinaryOperation::createSimplified
+ https://bugs.webkit.org/show_bug.cgi?id=132870
+
+ Added test contains calc() expressions with angle, time and frequency values,
+ covering all the newly introduced unit types, each of which used to fail.
+
+ Reviewed by Darin Adler.
+
+ * fast/css/calc-with-angle-time-frequency-expected.txt: Added.
+ * fast/css/calc-with-angle-time-frequency.html: Added.
+
</ins><span class="cx"> 2014-05-13 Krzysztof Wolanski <k.wolanski@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Rebaseline after r168575
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsscalcwithangletimefrequencyexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/calc-with-angle-time-frequency-expected.txt (0 => 168685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/calc-with-angle-time-frequency-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/calc-with-angle-time-frequency-expected.txt 2014-05-13 17:08:43 UTC (rev 168685)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+This test passes if it does not crash.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcsscalcwithangletimefrequencyhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/calc-with-angle-time-frequency.html (0 => 168685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/calc-with-angle-time-frequency.html (rev 0)
+++ trunk/LayoutTests/fast/css/calc-with-angle-time-frequency.html 2014-05-13 17:08:43 UTC (rev 168685)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<html>
+ <head>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ </script>
+ <style>
+ * {
+ width: calc(300deg/2);
+ width: calc(300rad/2);
+ width: calc(300grad/2);
+ width: calc(300turn/2);
+
+ width: calc(300ms/2);
+ width: calc(300s/2);
+
+ width: calc(300hz/2);
+ width: calc(300khz/2);
+ }
+ </style>
+ </head>
+ <body>
+ This test passes if it does not crash.
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168684 => 168685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-13 16:26:16 UTC (rev 168684)
+++ trunk/Source/WebCore/ChangeLog 2014-05-13 17:08:43 UTC (rev 168685)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-05-13 Martin Hodovan <mhodovan.u-szeged@partner.samsung.com>
+
+ ASSERTION FAILED: leftCategory != CalcOther && rightCategory != CalcOther
+ in WebCore::CSSCalcBinaryOperation::createSimplified
+ https://bugs.webkit.org/show_bug.cgi?id=132870
+
+ According to the standard, calc() should be able to handle angle, time
+ and frequency values as well: http://www.w3.org/TR/css3-values/#calc
+
+ Reviewed by Darin Adler.
+
+ Test: fast/css/calc-with-angle-time-frequency.html
+
+ * css/CSSCalculationValue.cpp:
+ (WebCore::unitCategory):
+ (WebCore::CSSCalcPrimitiveValue::createCalcExpression):
+ (WebCore::CSSCalcPrimitiveValue::computeLengthPx):
+ (WebCore::CSSCalcPrimitiveValue::addSubtractResult):
+ (WebCore::CSSCalcPrimitiveValue::determineCategory):
+ (WebCore::CSSCalcBinaryOperation::primitiveType)
+ * css/CSSCalculationValue.h: extending CalculationCategory
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::validCalculationUnit):
+ * css/CSSPrimitiveValue.cpp:
+ (WebCore::CSSPrimitiveValue::primitiveType):
+
</ins><span class="cx"> 2014-05-13 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Try to fix the !ENABLE(ICONDATABASE) build
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCalculationValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCalculationValue.cpp (168684 => 168685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCalculationValue.cpp 2014-05-13 16:26:16 UTC (rev 168684)
+++ trunk/Source/WebCore/css/CSSCalculationValue.cpp 2014-05-13 17:08:43 UTC (rev 168685)
</span><span class="lines">@@ -56,8 +56,6 @@
</span><span class="cx"> case CSSPrimitiveValue::CSS_NUMBER:
</span><span class="cx"> case CSSPrimitiveValue::CSS_PARSER_INTEGER:
</span><span class="cx"> return CalcNumber;
</span><del>- case CSSPrimitiveValue::CSS_PERCENTAGE:
- return CalcPercent;
</del><span class="cx"> case CSSPrimitiveValue::CSS_EMS:
</span><span class="cx"> case CSSPrimitiveValue::CSS_EXS:
</span><span class="cx"> case CSSPrimitiveValue::CSS_PX:
</span><span class="lines">@@ -69,6 +67,19 @@
</span><span class="cx"> case CSSPrimitiveValue::CSS_REMS:
</span><span class="cx"> case CSSPrimitiveValue::CSS_CHS:
</span><span class="cx"> return CalcLength;
</span><ins>+ case CSSPrimitiveValue::CSS_PERCENTAGE:
+ return CalcPercent;
+ case CSSPrimitiveValue::CSS_DEG:
+ case CSSPrimitiveValue::CSS_RAD:
+ case CSSPrimitiveValue::CSS_GRAD:
+ case CSSPrimitiveValue::CSS_TURN:
+ return CalcAngle;
+ case CSSPrimitiveValue::CSS_MS:
+ case CSSPrimitiveValue::CSS_S:
+ return CalcTime;
+ case CSSPrimitiveValue::CSS_HZ:
+ case CSSPrimitiveValue::CSS_KHZ:
+ return CalcFrequency;
</ins><span class="cx"> default:
</span><span class="cx"> return CalcOther;
</span><span class="cx"> }
</span><span class="lines">@@ -218,6 +229,9 @@
</span><span class="cx"> // Only types that could be part of a Length expression can be converted
</span><span class="cx"> // to a CalcExpressionNode. CalcPercentNumber makes no sense as a Length.
</span><span class="cx"> case CalcPercentNumber:
</span><ins>+ case CalcAngle:
+ case CalcTime:
+ case CalcFrequency:
</ins><span class="cx"> case CalcOther:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="lines">@@ -242,6 +256,9 @@
</span><span class="cx"> return m_value->getDoubleValue();
</span><span class="cx"> case CalcPercentLength:
</span><span class="cx"> case CalcPercentNumber:
</span><ins>+ case CalcAngle:
+ case CalcTime:
+ case CalcFrequency:
</ins><span class="cx"> case CalcOther:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><span class="lines">@@ -274,7 +291,7 @@
</span><span class="cx"> RefPtr<CSSPrimitiveValue> m_value;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-static const CalculationCategory addSubtractResult[CalcOther][CalcOther] = {
</del><ins>+static const CalculationCategory addSubtractResult[CalcAngle][CalcAngle] = {
</ins><span class="cx"> // CalcNumber CalcLength CalcPercent CalcPercentNumber CalcPercentLength
</span><span class="cx"> { CalcNumber, CalcOther, CalcPercentNumber, CalcPercentNumber, CalcOther }, // CalcNumber
</span><span class="cx"> { CalcOther, CalcLength, CalcPercentLength, CalcOther, CalcPercentLength }, // CalcLength
</span><span class="lines">@@ -294,7 +311,11 @@
</span><span class="cx"> switch (op) {
</span><span class="cx"> case CalcAdd:
</span><span class="cx"> case CalcSubtract:
</span><del>- return addSubtractResult[leftCategory][rightCategory];
</del><ins>+ if (leftCategory < CalcAngle || rightCategory < CalcAngle)
+ return addSubtractResult[leftCategory][rightCategory];
+ if (leftCategory == rightCategory)
+ return leftCategory;
+ return CalcOther;
</ins><span class="cx"> case CalcMultiply:
</span><span class="cx"> if (leftCategory != CalcNumber && rightCategory != CalcNumber)
</span><span class="cx"> return CalcOther;
</span><span class="lines">@@ -470,6 +491,12 @@
</span><span class="cx"> }
</span><span class="cx"> case CalcPercentLength:
</span><span class="cx"> case CalcPercentNumber:
</span><ins>+ case CalcAngle:
+ return CSSPrimitiveValue::CSS_DEG;
+ case CalcTime:
+ return CSSPrimitiveValue::CSS_MS;
+ case CalcFrequency:
+ return CSSPrimitiveValue::CSS_HZ;
</ins><span class="cx"> case CalcOther:
</span><span class="cx"> return CSSPrimitiveValue::CSS_UNKNOWN;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCalculationValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCalculationValue.h (168684 => 168685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCalculationValue.h 2014-05-13 16:26:16 UTC (rev 168684)
+++ trunk/Source/WebCore/css/CSSCalculationValue.h 2014-05-13 17:08:43 UTC (rev 168685)
</span><span class="lines">@@ -46,6 +46,9 @@
</span><span class="cx"> CalcPercent,
</span><span class="cx"> CalcPercentNumber,
</span><span class="cx"> CalcPercentLength,
</span><ins>+ CalcAngle,
+ CalcTime,
+ CalcFrequency,
</ins><span class="cx"> CalcOther
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (168684 => 168685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-05-13 16:26:16 UTC (rev 168684)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-05-13 17:08:43 UTC (rev 168685)
</span><span class="lines">@@ -1558,6 +1558,13 @@
</span><span class="cx">
</span><span class="cx"> bool b = false;
</span><span class="cx"> switch (m_parsedCalculation->category()) {
</span><ins>+ case CalcNumber:
+ b = (unitflags & FNumber);
+ if (!b && (unitflags & FInteger) && m_parsedCalculation->isInt())
+ b = true;
+ if (b && mustBeNonNegative && m_parsedCalculation->isNegative())
+ b = false;
+ break;
</ins><span class="cx"> case CalcLength:
</span><span class="cx"> b = (unitflags & FLength);
</span><span class="cx"> break;
</span><span class="lines">@@ -1566,19 +1573,21 @@
</span><span class="cx"> if (b && mustBeNonNegative && m_parsedCalculation->isNegative())
</span><span class="cx"> b = false;
</span><span class="cx"> break;
</span><del>- case CalcNumber:
- b = (unitflags & FNumber);
- if (!b && (unitflags & FInteger) && m_parsedCalculation->isInt())
- b = true;
- if (b && mustBeNonNegative && m_parsedCalculation->isNegative())
- b = false;
- break;
</del><span class="cx"> case CalcPercentLength:
</span><span class="cx"> b = (unitflags & FPercent) && (unitflags & FLength);
</span><span class="cx"> break;
</span><span class="cx"> case CalcPercentNumber:
</span><span class="cx"> b = (unitflags & FPercent) && (unitflags & FNumber);
</span><span class="cx"> break;
</span><ins>+ case CalcAngle:
+ b = (unitflags & FAngle);
+ break;
+ case CalcTime:
+ b = (unitflags & FTime);
+ break;
+ case CalcFrequency:
+ b = (unitflags & FFrequency);
+ break;
</ins><span class="cx"> case CalcOther:
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (168684 => 168685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2014-05-13 16:26:16 UTC (rev 168684)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2014-05-13 17:08:43 UTC (rev 168685)
</span><span class="lines">@@ -193,14 +193,20 @@
</span><span class="cx"> switch (m_value.calc->category()) {
</span><span class="cx"> case CalcNumber:
</span><span class="cx"> return CSSPrimitiveValue::CSS_NUMBER;
</span><ins>+ case CalcLength:
+ return CSSPrimitiveValue::CSS_PX;
</ins><span class="cx"> case CalcPercent:
</span><span class="cx"> return CSSPrimitiveValue::CSS_PERCENTAGE;
</span><del>- case CalcLength:
- return CSSPrimitiveValue::CSS_PX;
</del><span class="cx"> case CalcPercentNumber:
</span><span class="cx"> return CSSPrimitiveValue::CSS_CALC_PERCENTAGE_WITH_NUMBER;
</span><span class="cx"> case CalcPercentLength:
</span><span class="cx"> return CSSPrimitiveValue::CSS_CALC_PERCENTAGE_WITH_LENGTH;
</span><ins>+ case CalcAngle:
+ return CSSPrimitiveValue::CSS_DEG;
+ case CalcTime:
+ return CSSPrimitiveValue::CSS_MS;
+ case CalcFrequency:
+ return CSSPrimitiveValue::CSS_HZ;
</ins><span class="cx"> case CalcOther:
</span><span class="cx"> return CSSPrimitiveValue::CSS_UNKNOWN;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>