<!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>[175363] 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/175363">175363</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-29 20:27:24 -0700 (Wed, 29 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION NOT REACHED because RenderStyle::setWordSpacing() does not handle a Length value of type 'Calculated'.
https://bugs.webkit.org/show_bug.cgi?id=138054.
Patch by Said Abou-Hallawa <sabouhallawa@apple.com> on 2014-10-29
Reviewed by Zalan Bujtas.
Source/WebCore:
A Length of type 'Calculated' can be generated from blending two lengths of
different types. Setting the wordSpacing of the render style should be handled
correctly when the type of the new value is 'Calculated'.
Tests: css3/calculated-word-spacing.html.
Add a case for setting the render style wordSpacing to a <length> of type 'Calculated'.
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::setWordSpacing):
LayoutTests:
Ensure the render style's wordSpacing can be set correctly when the type of
the new value is 'Calculated'. The 'Calculated' Length value can result from
blending two Length values of different types. And these two Length values
are defined in two consecutive css animation key frames.
* css3/calculated-word-spacing-expected.txt: Added.
* css3/calculated-word-spacing.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="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3calculatedwordspacingexpectedtxt">trunk/LayoutTests/css3/calculated-word-spacing-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3calculatedwordspacinghtml">trunk/LayoutTests/css3/calculated-word-spacing.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (175362 => 175363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-10-30 02:29:42 UTC (rev 175362)
+++ trunk/LayoutTests/ChangeLog 2014-10-30 03:27:24 UTC (rev 175363)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-10-29 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ ASSERTION NOT REACHED because RenderStyle::setWordSpacing() does not handle a Length value of type 'Calculated'.
+ https://bugs.webkit.org/show_bug.cgi?id=138054.
+
+ Reviewed by Zalan Bujtas.
+
+ Ensure the render style's wordSpacing can be set correctly when the type of
+ the new value is 'Calculated'. The 'Calculated' Length value can result from
+ blending two Length values of different types. And these two Length values
+ are defined in two consecutive css animation key frames.
+
+ * css3/calculated-word-spacing-expected.txt: Added.
+ * css3/calculated-word-spacing.html: Added.
+
</ins><span class="cx"> 2014-10-29 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Skip compositing/regions/propagate-region-box-shadow-border-padding-for-video.html which
</span></span></pre></div>
<a id="trunkLayoutTestscss3calculatedwordspacingexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/calculated-word-spacing-expected.txt (0 => 175363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/calculated-word-spacing-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/calculated-word-spacing-expected.txt 2014-10-30 03:27:24 UTC (rev 175363)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS if no assert or crash in debug.
</ins></span></pre></div>
<a id="trunkLayoutTestscss3calculatedwordspacinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/calculated-word-spacing.html (0 => 175363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/calculated-word-spacing.html (rev 0)
+++ trunk/LayoutTests/css3/calculated-word-spacing.html 2014-10-30 03:27:24 UTC (rev 175363)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <style>
+ h1 {
+ -webkit-animation-name: spacing;
+ -webkit-animation-duration: 1s;
+ }
+ @-webkit-keyframes spacing {
+ 0% {
+ word-spacing: normal
+ }
+ 20% {
+ word-spacing: 100px
+ }
+ 40% {
+ word-spacing: 200%
+ }
+ 60% {
+ word-spacing: 20em
+ }
+ 80% {
+ word-spacing: 300%
+ }
+ 100% { }
+ }
+ </style>
+</head>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<body>
+<h1>PASS if no assert or crash in debug.</h1>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175362 => 175363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-30 02:29:42 UTC (rev 175362)
+++ trunk/Source/WebCore/ChangeLog 2014-10-30 03:27:24 UTC (rev 175363)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-10-29 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ ASSERTION NOT REACHED because RenderStyle::setWordSpacing() does not handle a Length value of type 'Calculated'.
+ https://bugs.webkit.org/show_bug.cgi?id=138054.
+
+ Reviewed by Zalan Bujtas.
+
+ A Length of type 'Calculated' can be generated from blending two lengths of
+ different types. Setting the wordSpacing of the render style should be handled
+ correctly when the type of the new value is 'Calculated'.
+
+ Tests: css3/calculated-word-spacing.html.
+
+ Add a case for setting the render style wordSpacing to a <length> of type 'Calculated'.
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::setWordSpacing):
+
</ins><span class="cx"> 2014-10-29 Hunseop Jeong <hs85.jeong@samsung.com>
</span><span class="cx">
</span><span class="cx"> [CoordinatedGraphics] Use modern for-loops
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (175362 => 175363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-10-30 02:29:42 UTC (rev 175362)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-10-30 03:27:24 UTC (rev 175363)
</span><span class="lines">@@ -1381,6 +1381,9 @@
</span><span class="cx"> case Fixed:
</span><span class="cx"> fontWordSpacing = value.value();
</span><span class="cx"> break;
</span><ins>+ case Calculated:
+ fontWordSpacing = value.nonNanCalculatedValue(maxValueForCssLength);
+ break;
</ins><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> fontWordSpacing = 0;
</span></span></pre>
</div>
</div>
</body>
</html>