<!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>[172033] 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/172033">172033</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-05 09:46:20 -0700 (Tue, 05 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixing calc() parameter parsing in cubic-bezier functions
https://bugs.webkit.org/show_bug.cgi?id=135605
Patch by Renata Hodovan <rhodovan.u-szeged@partner.samsung.com> on 2014-08-05
Reviewed by Andreas Kling.
Source/WebCore:
Before this patch, calc values in cubic-bezier functions weren't being read correctly
since they were handled as simple floats.
This is a backport of my fix in Blink: https://codereview.chromium.org/369313002/
Test: css3/calc/cubic-bezier-with-multiple-calcs-crash.html.html
* css/CSSParser.cpp:
(WebCore::CSSParser::parseCubicBezierTimingFunctionValue):
LayoutTests:
* css3/calc/cubic-bezier-with-multiple-calcs-crash.html-expected.txt: Added.
* css3/calc/cubic-bezier-with-multiple-calcs-crash.html.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="#trunkLayoutTestscss3calccubicbezierwithmultiplecalcscrashhtmlexpectedtxt">trunk/LayoutTests/css3/calc/cubic-bezier-with-multiple-calcs-crash.html-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3calccubicbezierwithmultiplecalcscrashhtmlhtml">trunk/LayoutTests/css3/calc/cubic-bezier-with-multiple-calcs-crash.html.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (172032 => 172033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-08-05 16:42:09 UTC (rev 172032)
+++ trunk/LayoutTests/ChangeLog 2014-08-05 16:46:20 UTC (rev 172033)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-08-05 Renata Hodovan <rhodovan.u-szeged@partner.samsung.com>
+
+ Fixing calc() parameter parsing in cubic-bezier functions
+ https://bugs.webkit.org/show_bug.cgi?id=135605
+
+ Reviewed by Andreas Kling.
+
+ * css3/calc/cubic-bezier-with-multiple-calcs-crash.html-expected.txt: Added.
+ * css3/calc/cubic-bezier-with-multiple-calcs-crash.html.html: Added.
+
</ins><span class="cx"> 2014-08-05 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Select text activity should return replaced text instead of previously selected text
</span></span></pre></div>
<a id="trunkLayoutTestscss3calccubicbezierwithmultiplecalcscrashhtmlexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/calc/cubic-bezier-with-multiple-calcs-crash.html-expected.txt (0 => 172033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/calc/cubic-bezier-with-multiple-calcs-crash.html-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/calc/cubic-bezier-with-multiple-calcs-crash.html-expected.txt 2014-08-05 16:46:20 UTC (rev 172033)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+This tests that calc() values in cubic-bezier functions are read correctly.
+
+PASS
</ins></span></pre></div>
<a id="trunkLayoutTestscss3calccubicbezierwithmultiplecalcscrashhtmlhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/calc/cubic-bezier-with-multiple-calcs-crash.html.html (0 => 172033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/calc/cubic-bezier-with-multiple-calcs-crash.html.html (rev 0)
+++ trunk/LayoutTests/css3/calc/cubic-bezier-with-multiple-calcs-crash.html.html 2014-08-05 16:46:20 UTC (rev 172033)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<style>
+* {
+ transition-timing-function: cubic-bezier(0, 0, calc(0.5), calc(1.0));
+}
+</style>
+</head>
+<body>
+ <p>This tests that calc() values in cubic-bezier functions are read correctly.</p>
+ <p id="result"></p>
+</body>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ var body = document.getElementsByTagName("body")[0];
+ if (window.getComputedStyle(body)["transitionTimingFunction"] == "cubic-bezier(0, 0, 0.5, 1)")
+ document.getElementById("result").innerText = "PASS";
+ else
+ document.getElementById("result").innerText = "FAIL";
+</script>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172032 => 172033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-05 16:42:09 UTC (rev 172032)
+++ trunk/Source/WebCore/ChangeLog 2014-08-05 16:46:20 UTC (rev 172033)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-08-05 Renata Hodovan <rhodovan.u-szeged@partner.samsung.com>
+
+ Fixing calc() parameter parsing in cubic-bezier functions
+ https://bugs.webkit.org/show_bug.cgi?id=135605
+
+ Reviewed by Andreas Kling.
+
+ Before this patch, calc values in cubic-bezier functions weren't being read correctly
+ since they were handled as simple floats.
+
+ This is a backport of my fix in Blink: https://codereview.chromium.org/369313002/
+
+ Test: css3/calc/cubic-bezier-with-multiple-calcs-crash.html.html
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseCubicBezierTimingFunctionValue):
+
</ins><span class="cx"> 2014-08-05 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [MSE] Seeking occasionally causes many frames to be displayed in "fast forward" mode
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (172032 => 172033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-08-05 16:42:09 UTC (rev 172032)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-08-05 16:46:20 UTC (rev 172033)
</span><span class="lines">@@ -4545,7 +4545,7 @@
</span><span class="cx"> CSSParserValue* v = args->current();
</span><span class="cx"> if (!validUnit(v, FNumber))
</span><span class="cx"> return false;
</span><del>- result = v->fValue;
</del><ins>+ result = parsedDouble(v, ReleaseParsedCalcValue);
</ins><span class="cx"> v = args->next();
</span><span class="cx"> if (!v)
</span><span class="cx"> // The last number in the function has no comma after it, so we're done.
</span></span></pre>
</div>
</div>
</body>
</html>