<!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>[210240] trunk/Source/WebCore</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/210240">210240</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2017-01-03 10:53:04 -0800 (Tue, 03 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Placeholder style mechanism leaks CSSFontSelector for first Document styled.
<https://webkit.org/b/166652>
Reviewed by Antti Koivisto.
The placeholder style is used when we're resolving style for a non-rendered
element, or any element before stylesheets have loaded.
An old optimization had us reusing the same style each time, which meant that
since it was initialized with a font selector the first time, it kept that
font selector alive forever.
As we have to clone the style anyway, fix this by just making a new style
each time, using the current document's font selector.
* style/StyleTreeResolver.cpp:
(WebCore::Style::makePlaceholderStyle):
(WebCore::Style::TreeResolver::TreeResolver):
(WebCore::Style::TreeResolver::styleForElement):
(WebCore::Style::ensurePlaceholderStyle): Deleted.
(WebCore::Style::isPlaceholderStyle): Deleted.
* style/StyleTreeResolver.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorestyleStyleTreeResolvercpp">trunk/Source/WebCore/style/StyleTreeResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleTreeResolverh">trunk/Source/WebCore/style/StyleTreeResolver.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210239 => 210240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-03 15:02:26 UTC (rev 210239)
+++ trunk/Source/WebCore/ChangeLog 2017-01-03 18:53:04 UTC (rev 210240)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2017-01-03 Andreas Kling <akling@apple.com>
+
+ Placeholder style mechanism leaks CSSFontSelector for first Document styled.
+ <https://webkit.org/b/166652>
+
+ Reviewed by Antti Koivisto.
+
+ The placeholder style is used when we're resolving style for a non-rendered
+ element, or any element before stylesheets have loaded.
+
+ An old optimization had us reusing the same style each time, which meant that
+ since it was initialized with a font selector the first time, it kept that
+ font selector alive forever.
+
+ As we have to clone the style anyway, fix this by just making a new style
+ each time, using the current document's font selector.
+
+ * style/StyleTreeResolver.cpp:
+ (WebCore::Style::makePlaceholderStyle):
+ (WebCore::Style::TreeResolver::TreeResolver):
+ (WebCore::Style::TreeResolver::styleForElement):
+ (WebCore::Style::ensurePlaceholderStyle): Deleted.
+ (WebCore::Style::isPlaceholderStyle): Deleted.
+ * style/StyleTreeResolver.h:
+
</ins><span class="cx"> 2017-01-03 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> A floating element within <li> overlaps with the marker
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleTreeResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleTreeResolver.cpp (210239 => 210240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleTreeResolver.cpp 2017-01-03 15:02:26 UTC (rev 210239)
+++ trunk/Source/WebCore/style/StyleTreeResolver.cpp 2017-01-03 18:53:04 UTC (rev 210240)
</span><span class="lines">@@ -51,13 +51,9 @@
</span><span class="cx">
</span><span class="cx"> namespace Style {
</span><span class="cx">
</span><del>-static RenderStyle* placeholderStyle;
-
-static void ensurePlaceholderStyle(Document& document)
</del><ins>+static std::unique_ptr<RenderStyle> makePlaceholderStyle(Document& document)
</ins><span class="cx"> {
</span><del>- if (placeholderStyle)
- return;
- placeholderStyle = RenderStyle::createPtr().release();
</del><ins>+ auto placeholderStyle = RenderStyle::createPtr();
</ins><span class="cx"> placeholderStyle->setDisplay(NONE);
</span><span class="cx"> placeholderStyle->setIsPlaceholderStyle();
</span><span class="cx">
</span><span class="lines">@@ -70,12 +66,12 @@
</span><span class="cx"> placeholderStyle->setFontDescription(fontDescription);
</span><span class="cx">
</span><span class="cx"> placeholderStyle->fontCascade().update(&document.fontSelector());
</span><ins>+ return placeholderStyle;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TreeResolver::TreeResolver(Document& document)
</span><span class="cx"> : m_document(document)
</span><span class="cx"> {
</span><del>- ensurePlaceholderStyle(document);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TreeResolver::~TreeResolver()
</span><span class="lines">@@ -133,7 +129,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_document.haveStylesheetsLoaded() && !element.renderer()) {
</span><span class="cx"> m_document.setHasNodesWithPlaceholderStyle();
</span><del>- return RenderStyle::clonePtr(*placeholderStyle);
</del><ins>+ return makePlaceholderStyle(m_document);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (element.hasCustomStyleResolveCallbacks()) {
</span><span class="lines">@@ -550,10 +546,5 @@
</span><span class="cx"> return resolutionNestingDepth;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool isPlaceholderStyle(const RenderStyle& style)
-{
- return &style == placeholderStyle;
</del><span class="cx"> }
</span><del>-
</del><span class="cx"> }
</span><del>-}
</del></span></pre></div>
<a id="trunkSourceWebCorestyleStyleTreeResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleTreeResolver.h (210239 => 210240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleTreeResolver.h 2017-01-03 15:02:26 UTC (rev 210239)
+++ trunk/Source/WebCore/style/StyleTreeResolver.h 2017-01-03 18:53:04 UTC (rev 210240)
</span><span class="lines">@@ -109,8 +109,6 @@
</span><span class="cx"> void queuePostResolutionCallback(Function<void ()>&&);
</span><span class="cx"> bool postResolutionCallbacksAreSuspended();
</span><span class="cx">
</span><del>-bool isPlaceholderStyle(const RenderStyle&);
-
</del><span class="cx"> class PostResolutionCallbackDisabler {
</span><span class="cx"> public:
</span><span class="cx"> explicit PostResolutionCallbackDisabler(Document&);
</span></span></pre>
</div>
</div>
</body>
</html>