<!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>[202127] 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/202127">202127</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-06-16 10:10:38 -0700 (Thu, 16 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Sporadic crash in HashTableAddResult following CSSValuePool::createFontFamilyValue
https://bugs.webkit.org/show_bug.cgi?id=158297
Reviewed by Darin Adler.
Source/WebCore:
In an effort to reduce the flash of unstyled content, we force all elements
to have display: none during an external stylesheet load. We do this by
ignoring the CSS cascade and forcing all elements to have a placeholder style
which hardcodes display: none. (This is necessary to make elements created by
script during the stylesheet load not flash.)
This style is exposed to web content via getComputedStyle(), which means it
needs to maintain the invariant that font-families can never be null strings.
We enforce this by forcing the font-family to be the standard font name.
Test: fast/text/placeholder-renderstyle-null-font.html
* style/StyleTreeResolver.cpp:
(WebCore::Style::ensurePlaceholderStyle):
LayoutTests:
* fast/text/placeholder-renderstyle-null-font-expected.txt: Added.
* fast/text/placeholder-renderstyle-null-font.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="#trunkSourceWebCorestyleStyleTreeResolvercpp">trunk/Source/WebCore/style/StyleTreeResolver.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextplaceholderrenderstylenullfontexpectedtxt">trunk/LayoutTests/fast/text/placeholder-renderstyle-null-font-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextplaceholderrenderstylenullfonthtml">trunk/LayoutTests/fast/text/placeholder-renderstyle-null-font.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202126 => 202127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-16 16:32:04 UTC (rev 202126)
+++ trunk/LayoutTests/ChangeLog 2016-06-16 17:10:38 UTC (rev 202127)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-06-16 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Sporadic crash in HashTableAddResult following CSSValuePool::createFontFamilyValue
+ https://bugs.webkit.org/show_bug.cgi?id=158297
+
+ Reviewed by Darin Adler.
+
+ * fast/text/placeholder-renderstyle-null-font-expected.txt: Added.
+ * fast/text/placeholder-renderstyle-null-font.html: Added.
+
</ins><span class="cx"> 2016-06-15 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support for Symbol.isConcatSpreadable (round 2)
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextplaceholderrenderstylenullfontexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/placeholder-renderstyle-null-font-expected.txt (0 => 202127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/placeholder-renderstyle-null-font-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/placeholder-renderstyle-null-font-expected.txt 2016-06-16 17:10:38 UTC (rev 202127)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+This test makes sure that placeholder RenderStyles that we use during external stylesheet loads have a non-null font family. The test passes if there is no crash.
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextplaceholderrenderstylenullfonthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/placeholder-renderstyle-null-font.html (0 => 202127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/placeholder-renderstyle-null-font.html (rev 0)
+++ trunk/LayoutTests/fast/text/placeholder-renderstyle-null-font.html 2016-06-16 17:10:38 UTC (rev 202127)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!DOCTYPE html>
+<html id="htmlElement">
+<head>
+<script>
+</script>
+</head>
+<body>
+This test makes sure that placeholder RenderStyles that we use during external stylesheet loads have a non-null font family. The test passes if there is no crash.
+<svg id="target"></svg>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+document.getElementById("htmlElement").offsetTop;
+
+var link = document.createElement("link");
+link.rel = "stylesheet";
+link.href = "test.css";
+document.head.appendChild(link);
+
+var groupNode = document.createElementNS("http://www.w3.org/2000/svg", "g");
+groupNode.style.display = "none";
+var target = document.getElementById("target");
+target.appendChild(groupNode);
+window.getComputedStyle(groupNode).fontFamily;
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202126 => 202127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-16 16:32:04 UTC (rev 202126)
+++ trunk/Source/WebCore/ChangeLog 2016-06-16 17:10:38 UTC (rev 202127)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-06-16 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Sporadic crash in HashTableAddResult following CSSValuePool::createFontFamilyValue
+ https://bugs.webkit.org/show_bug.cgi?id=158297
+
+ Reviewed by Darin Adler.
+
+ In an effort to reduce the flash of unstyled content, we force all elements
+ to have display: none during an external stylesheet load. We do this by
+ ignoring the CSS cascade and forcing all elements to have a placeholder style
+ which hardcodes display: none. (This is necessary to make elements created by
+ script during the stylesheet load not flash.)
+
+ This style is exposed to web content via getComputedStyle(), which means it
+ needs to maintain the invariant that font-families can never be null strings.
+ We enforce this by forcing the font-family to be the standard font name.
+
+ Test: fast/text/placeholder-renderstyle-null-font.html
+
+ * style/StyleTreeResolver.cpp:
+ (WebCore::Style::ensurePlaceholderStyle):
+
</ins><span class="cx"> 2016-06-16 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Avoid some temporary String allocations for common HTTP headers in ResourceResponse::platformLazyInit()
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleTreeResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleTreeResolver.cpp (202126 => 202127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleTreeResolver.cpp 2016-06-16 16:32:04 UTC (rev 202126)
+++ trunk/Source/WebCore/style/StyleTreeResolver.cpp 2016-06-16 17:10:38 UTC (rev 202127)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #include "PlatformStrategies.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><ins>+#include "StyleFontSizeFunctions.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "Text.h"
</span><span class="cx">
</span><span class="lines">@@ -63,6 +64,15 @@
</span><span class="cx"> placeholderStyle = RenderStyle::createPtr().release();
</span><span class="cx"> placeholderStyle->setDisplay(NONE);
</span><span class="cx"> placeholderStyle->setIsPlaceholderStyle();
</span><ins>+
+ FontCascadeDescription fontDescription;
+ fontDescription.setOneFamily(standardFamily);
+ fontDescription.setKeywordSizeFromIdentifier(CSSValueMedium);
+ float size = Style::fontSizeForKeyword(CSSValueMedium, false, document);
+ fontDescription.setSpecifiedSize(size);
+ fontDescription.setComputedSize(size);
+ placeholderStyle->setFontDescription(fontDescription);
+
</ins><span class="cx"> placeholderStyle->fontCascade().update(&document.fontSelector());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>