<!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>[186971] 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/186971">186971</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-07-17 16:26:34 -0700 (Fri, 17 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>style.fontFamily accessor crashes on unstyled node created from DOMParser().parseFromString()
https://bugs.webkit.org/show_bug.cgi?id=147026
<rdar://problem/21864487>
Reviewed by Andreas Kling.
Source/WebCore:
Font CSS properties are a little special because they are used as indices into caches.
Normally, StyleResolver gives all nodes a default font family, so our cache works correctly.
However, if the document doesn't have a Settings object, StyleResolver wasn't doing this.
Documents created from DOMParser().parseFromString() don't have a Settings object.
Test: fast/text/crash-font-family-parsed.html
* css/StyleResolver.cpp:
(WebCore::StyleResolver::defaultStyleForElement):
(WebCore::StyleResolver::initializeFontStyle): Set a font family even if we don't have a
Settings object.
LayoutTests:
* fast/text/crash-font-family-parsed-expected.txt: Added.
* fast/text/crash-font-family-parsed.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="#trunkLayoutTestsfasttextcrashfontfamilyparsedexpectedtxt">trunk/LayoutTests/fast/text/crash-font-family-parsed-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextcrashfontfamilyparsedhtml">trunk/LayoutTests/fast/text/crash-font-family-parsed.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (186970 => 186971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-07-17 23:18:44 UTC (rev 186970)
+++ trunk/LayoutTests/ChangeLog 2015-07-17 23:26:34 UTC (rev 186971)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-07-17 Myles C. Maxfield <mmaxfield@apple.com>
+
+ style.fontFamily accessor crashes on unstyled node created from DOMParser().parseFromString()
+ https://bugs.webkit.org/show_bug.cgi?id=147026
+ <rdar://problem/21864487>
+
+ Reviewed by Andreas Kling.
+
+ * fast/text/crash-font-family-parsed-expected.txt: Added.
+ * fast/text/crash-font-family-parsed.html: Added.
+
</ins><span class="cx"> 2015-07-17 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rename test file from promise-resolve-non-dom.js to promise-resolve-in-non-dom.js
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextcrashfontfamilyparsedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/crash-font-family-parsed-expected.txt (0 => 186971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/crash-font-family-parsed-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/crash-font-family-parsed-expected.txt 2015-07-17 23:26:34 UTC (rev 186971)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+This test passes if there is no crash.
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextcrashfontfamilyparsedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/crash-font-family-parsed.html (0 => 186971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/crash-font-family-parsed.html (rev 0)
+++ trunk/LayoutTests/fast/text/crash-font-family-parsed.html 2015-07-17 23:26:34 UTC (rev 186971)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test passes if there is no crash.
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+var parser = new DOMParser();
+var doc = parser.parseFromString("<?xml><!DOCTYPE svg><svg></svg>", "application/xml");
+var style = getComputedStyle(doc.children[0]);
+style.cssText;
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186970 => 186971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-17 23:18:44 UTC (rev 186970)
+++ trunk/Source/WebCore/ChangeLog 2015-07-17 23:26:34 UTC (rev 186971)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2015-07-17 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><ins>+ style.fontFamily accessor crashes on unstyled node created from DOMParser().parseFromString()
+ https://bugs.webkit.org/show_bug.cgi?id=147026
+ <rdar://problem/21864487>
+
+ Reviewed by Andreas Kling.
+
+ Font CSS properties are a little special because they are used as indices into caches.
+ Normally, StyleResolver gives all nodes a default font family, so our cache works correctly.
+ However, if the document doesn't have a Settings object, StyleResolver wasn't doing this.
+ Documents created from DOMParser().parseFromString() don't have a Settings object.
+
+ Test: fast/text/crash-font-family-parsed.html
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::defaultStyleForElement):
+ (WebCore::StyleResolver::initializeFontStyle): Set a font family even if we don't have a
+ Settings object.
+
+2015-07-17 Myles C. Maxfield <mmaxfield@apple.com>
+
</ins><span class="cx"> Video posters disappear once media has loaded
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=147045
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (186970 => 186971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2015-07-17 23:18:44 UTC (rev 186970)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2015-07-17 23:26:34 UTC (rev 186971)
</span><span class="lines">@@ -1048,10 +1048,10 @@
</span><span class="cx"> {
</span><span class="cx"> m_state.setStyle(RenderStyle::create());
</span><span class="cx"> // Make sure our fonts are initialized if we don't inherit them from our parent style.
</span><del>- if (Settings* settings = documentSettings()) {
- initializeFontStyle(settings);
</del><ins>+ initializeFontStyle(documentSettings());
+ if (documentSettings())
</ins><span class="cx"> m_state.style()->fontCascade().update(&document().fontSelector());
</span><del>- } else
</del><ins>+ else
</ins><span class="cx"> m_state.style()->fontCascade().update(nullptr);
</span><span class="cx">
</span><span class="cx"> return m_state.takeStyle();
</span><span class="lines">@@ -2035,7 +2035,8 @@
</span><span class="cx"> void StyleResolver::initializeFontStyle(Settings* settings)
</span><span class="cx"> {
</span><span class="cx"> FontDescription fontDescription;
</span><del>- fontDescription.setRenderingMode(settings->fontRenderingMode());
</del><ins>+ if (settings)
+ fontDescription.setRenderingMode(settings->fontRenderingMode());
</ins><span class="cx"> fontDescription.setOneFamily(standardFamily);
</span><span class="cx"> fontDescription.setKeywordSizeFromIdentifier(CSSValueMedium);
</span><span class="cx"> setFontSize(fontDescription, Style::fontSizeForKeyword(CSSValueMedium, false, document()));
</span></span></pre>
</div>
</div>
</body>
</html>