<!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>[171785] 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/171785">171785</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-07-29 20:51:31 -0700 (Tue, 29 Jul 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Crash when using 'em' units to specify font-size inside animation keyframe.
&lt;https://webkit.org/b/135395&gt;
&lt;rdar://problem/17851910&gt;

Source/WebCore:
We'd forgotten to initialize the &quot;parent style&quot; when resolving keyframe
styles, and this led to a crash in length conversion where the code
assumes a parent style will be present.

To keep this fix minimal, simply make the &quot;parent style&quot; a clone of the
base element style.

Reviewed by Simon Fraser.

Test: fast/animation/keyframe-with-font-size-in-em-units.html

* css/StyleResolver.cpp:
(WebCore::StyleResolver::styleForKeyframe):

LayoutTests:
Add a reduced test case to cover this bug.

Reviewed by Simon Fraser.

* fast/animation/keyframe-with-font-size-in-em-units-expected.txt: Added.
* fast/animation/keyframe-with-font-size-in-em-units.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="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastanimationkeyframewithfontsizeinemunitsexpectedtxt">trunk/LayoutTests/fast/animation/keyframe-with-font-size-in-em-units-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastanimationkeyframewithfontsizeinemunitshtml">trunk/LayoutTests/fast/animation/keyframe-with-font-size-in-em-units.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (171784 => 171785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-07-30 03:48:54 UTC (rev 171784)
+++ trunk/LayoutTests/ChangeLog        2014-07-30 03:51:31 UTC (rev 171785)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-07-29  Andreas Kling  &lt;akling@apple.com&gt;
+
+        Crash when using 'em' units to specify font-size inside animation keyframe.
+        &lt;https://webkit.org/b/135395&gt;
+        &lt;rdar://problem/17851910&gt;
+
+        Add a reduced test case to cover this bug.
+
+        Reviewed by Simon Fraser.
+
+        * fast/animation/keyframe-with-font-size-in-em-units-expected.txt: Added.
+        * fast/animation/keyframe-with-font-size-in-em-units.html: Added.
+
</ins><span class="cx"> 2014-07-29  Alexey Proskuryakov  &lt;ap@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         fast/borders/border-radius-on-subpixel-position-non-hidpi.html fails on Retina machines
</span></span></pre></div>
<a id="trunkLayoutTestsfastanimationkeyframewithfontsizeinemunitsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/animation/keyframe-with-font-size-in-em-units-expected.txt (0 => 171785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/animation/keyframe-with-font-size-in-em-units-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/animation/keyframe-with-font-size-in-em-units-expected.txt        2014-07-30 03:51:31 UTC (rev 171785)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS (no crash)
</ins></span></pre></div>
<a id="trunkLayoutTestsfastanimationkeyframewithfontsizeinemunitshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/animation/keyframe-with-font-size-in-em-units.html (0 => 171785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/animation/keyframe-with-font-size-in-em-units.html                                (rev 0)
+++ trunk/LayoutTests/fast/animation/keyframe-with-font-size-in-em-units.html        2014-07-30 03:51:31 UTC (rev 171785)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;style&gt;
+@-webkit-keyframes foo {
+    from {
+        font-size: 2em;
+    }
+}
+#foo {
+    -webkit-animation: foo 1s linear 0.0s infinite;
+}
+&lt;/style&gt;
+&lt;script&gt;
+if (window.testRunner)
+    testRunner.dumpAsText();
+&lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;div id=&quot;foo&quot;&gt;&lt;/div&gt;
+&lt;span&gt;PASS (no crash)&lt;/span&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171784 => 171785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-07-30 03:48:54 UTC (rev 171784)
+++ trunk/Source/WebCore/ChangeLog        2014-07-30 03:51:31 UTC (rev 171785)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-07-29  Andreas Kling  &lt;akling@apple.com&gt;
+
+        Crash when using 'em' units to specify font-size inside animation keyframe.
+        &lt;https://webkit.org/b/135395&gt;
+        &lt;rdar://problem/17851910&gt;
+
+        We'd forgotten to initialize the &quot;parent style&quot; when resolving keyframe
+        styles, and this led to a crash in length conversion where the code
+        assumes a parent style will be present.
+
+        To keep this fix minimal, simply make the &quot;parent style&quot; a clone of the
+        base element style.
+
+        Reviewed by Simon Fraser.
+
+        Test: fast/animation/keyframe-with-font-size-in-em-units.html
+
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::styleForKeyframe):
+
</ins><span class="cx"> 2014-07-29  Pratik Solanki  &lt;psolanki@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [iOS] REGRESSION(r171526): PDF documents fail to load in WebKit1 with disk image caching enabled
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (171784 => 171785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp        2014-07-30 03:48:54 UTC (rev 171784)
+++ trunk/Source/WebCore/css/StyleResolver.cpp        2014-07-30 03:51:31 UTC (rev 171785)
</span><span class="lines">@@ -825,6 +825,7 @@
</span><span class="cx"> 
</span><span class="cx">     // Create the style
</span><span class="cx">     state.setStyle(RenderStyle::clone(elementStyle));
</span><ins>+    state.setParentStyle(RenderStyle::clone(elementStyle));
</ins><span class="cx">     state.setLineHeightValue(0);
</span><span class="cx"> 
</span><span class="cx">     TextDirection direction;
</span></span></pre>
</div>
</div>

</body>
</html>