<!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>[203184] branches/safari-602.1.40.1-branch/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/203184">203184</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-07-13 13:32:57 -0700 (Wed, 13 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/203172">r203172</a>. rdar://problem/27306545</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6021401branchSourceWebCoreChangeLog">branches/safari-602.1.40.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6021401branchSourceWebCoredomAuthorStyleSheetscpp">branches/safari-602.1.40.1-branch/Source/WebCore/dom/AuthorStyleSheets.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6021401branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.40.1-branch/Source/WebCore/ChangeLog (203183 => 203184)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.40.1-branch/Source/WebCore/ChangeLog 2016-07-13 20:31:37 UTC (rev 203183)
+++ branches/safari-602.1.40.1-branch/Source/WebCore/ChangeLog 2016-07-13 20:32:57 UTC (rev 203184)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2016-07-13 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r203172.
+
+ 2016-07-13 Antti Koivisto <antti@apple.com>
+
+ v2: WebContent crash due to RELEASE_ASSERT(!m_inLoadPendingImages) in StyleResolver::~StyleResolver()
+ https://bugs.webkit.org/show_bug.cgi?id=159722
+
+ Reviewed by Andreas Kling.
+
+ We have crashes where a StyleResolver is deleted underneath pseudoStyleForElement (key parts of the stack):
+
+ 0 WebCore::StyleResolver::~StyleResolver
+ 3 WebCore::AuthorStyleSheets::updateActiveStyleSheets
+ 4 WebCore::Document::styleResolverChanged
+ 5 WebKit::WebPage::viewportConfigurationChanged()
+ 6 WebKit::WebPage::mainFrameDidLayout()
+ 9 WebCore::FrameLoader::checkCompleted
+ 13 WebCore::ResourceLoader::cancel
+ 19 WebKit::WebLoaderStrategy::loadResource
+ 24 WebCore::Style::loadPendingImage
+ 27 WebCore::StyleResolver::pseudoStyleForElement
+ 29 WebCore::RenderTreeUpdater::updateBeforeOrAfterPseudoElement
+ 33 WebCore::Document::recalcStyle
+
+ This appears to be happening when a content blocker blocks a resource load for an image referenced from a stylesheet
+ and triggers synchronous cancellation of the load. With engine in suitable state this can clear style resolver.
+
+ No test, don't know how to make one. This is very timing and engine state dependent.
+
+ * dom/AuthorStyleSheets.cpp:
+ (WebCore::AuthorStyleSheets::updateActiveStyleSheets):
+
+ We have an existing check here that prevents destruction of the style resolver when we are in the middle of
+ a style resolution. However the old inStyleRecalc() bit no longer covers the render tree update phase. Pseudo
+ elements are resolved during render tree update.
+
+ Fix by adding a check for inRenderTreeUpdate() bit too.
+
+ This just fixes a regression. A proper fix would be to gather all resources during style resolution
+ and trigger the loads afterwards.
+
</ins><span class="cx"> 2016-07-07 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r202923.
</span></span></pre></div>
<a id="branchessafari6021401branchSourceWebCoredomAuthorStyleSheetscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.40.1-branch/Source/WebCore/dom/AuthorStyleSheets.cpp (203183 => 203184)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.40.1-branch/Source/WebCore/dom/AuthorStyleSheets.cpp 2016-07-13 20:31:37 UTC (rev 203183)
+++ branches/safari-602.1.40.1-branch/Source/WebCore/dom/AuthorStyleSheets.cpp 2016-07-13 20:32:57 UTC (rev 203184)
</span><span class="lines">@@ -291,10 +291,10 @@
</span><span class="cx">
</span><span class="cx"> bool AuthorStyleSheets::updateActiveStyleSheets(UpdateFlag updateFlag)
</span><span class="cx"> {
</span><del>- if (m_document.inStyleRecalc()) {
- // SVG <use> element may manage to invalidate style selector in the middle of a style recalc.
- // https://bugs.webkit.org/show_bug.cgi?id=54344
- // FIXME: This should be fixed in SVG and the call site replaced by ASSERT(!m_inStyleRecalc).
</del><ins>+ if (m_document.inStyleRecalc() || m_document.inRenderTreeUpdate()) {
+ // Protect against deleting style resolver in the middle of a style resolution.
+ // Crash stacks indicate we can get here when z resource load fails synchronously (for example due to content blocking).
+ // FIXME: These kind of cases should be eliminated and this path replaced by an assert.
</ins><span class="cx"> m_pendingUpdateType = FullUpdate;
</span><span class="cx"> m_document.scheduleForcedStyleRecalc();
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>