<!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>[203569] branches/safari-602-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/203569">203569</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-07-22 02:25:41 -0700 (Fri, 22 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/203450">r203450</a>. rdar://problem/21439264</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoredomDocumentcpp">branches/safari-602-branch/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCoreloaderLoaderStrategycpp">branches/safari-602-branch/Source/WebCore/loader/LoaderStrategy.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCoreloaderLoaderStrategyh">branches/safari-602-branch/Source/WebCore/loader/LoaderStrategy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (203568 => 203569)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-22 09:25:38 UTC (rev 203568)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-22 09:25:41 UTC (rev 203569)
</span><span class="lines">@@ -1,5 +1,43 @@
</span><span class="cx"> 2016-07-22 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r203450. rdar://problem/21439264
+
+ 2016-07-20 Chris Dumez <cdumez@apple.com>
+
+ PostResolutionCallbackDisabler can resume pending requests while a ResourceLoadSuspender is alive
+ https://bugs.webkit.org/show_bug.cgi?id=159962
+ <rdar://problem/21439264>
+
+ Reviewed by David Kilzer.
+
+ PostResolutionCallbackDisabler can resume pending requests while a ResourceLoadSuspender
+ is alive. We have both PostResolutionCallbackDisabler and ResourceLoadSuspender that
+ call LoaderStrategy::suspendPendingRequests() / LoaderStrategy::resumePendingRequests().
+ However, PostResolutionCallbackDisabler and ResourceLoadSuspender are not aware of each
+ other. It is therefore possible for a PostResolutionCallbackDisabler object to get
+ destroyed, causing LoaderStrategy::resumePendingRequests() to be called while a
+ ResourceLoadSuspender object is alive.
+
+ This leads to hard to investigate crashes where we end up re-entering WebKit and killing
+ the style resolver.
+
+ This patch drops ResourceLoadSuspender and uses PostResolutionCallbackDisabler instead.
+ There was only one user of ResourceLoadSuspender and PostResolutionCallbackDisabler
+ is better because it manages a resolutionNestingDepth counter internally to make sure
+ it only calls LoaderStrategy::resumePendingRequests() once all
+ PostResolutionCallbackDisabler instances are destroyed.
+
+ No new tests, there is no easy way to reproduce the crashes.
+
+ * dom/Document.cpp:
+ (WebCore::Document::styleForElementIgnoringPendingStylesheets):
+ * loader/LoaderStrategy.cpp:
+ (WebCore::ResourceLoadSuspender::ResourceLoadSuspender): Deleted.
+ (WebCore::ResourceLoadSuspender::~ResourceLoadSuspender): Deleted.
+ * loader/LoaderStrategy.h:
+
+2016-07-22 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r203425. rdar://problem/27488703
</span><span class="cx">
</span><span class="cx"> 2016-07-19 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/dom/Document.cpp (203568 => 203569)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/dom/Document.cpp 2016-07-22 09:25:38 UTC (rev 203568)
+++ branches/safari-602-branch/Source/WebCore/dom/Document.cpp 2016-07-22 09:25:41 UTC (rev 203569)
</span><span class="lines">@@ -2043,7 +2043,7 @@
</span><span class="cx"> ASSERT(&element.document() == this);
</span><span class="cx">
</span><span class="cx"> // On iOS request delegates called during styleForElement may result in re-entering WebKit and killing the style resolver.
</span><del>- ResourceLoadSuspender suspender;
</del><ins>+ Style::PostResolutionCallbackDisabler disabler(*this);
</ins><span class="cx">
</span><span class="cx"> TemporaryChange<bool> change(m_ignorePendingStylesheets, true);
</span><span class="cx"> auto elementStyle = element.resolveStyle(parentStyle);
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreloaderLoaderStrategycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/loader/LoaderStrategy.cpp (203568 => 203569)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/loader/LoaderStrategy.cpp 2016-07-22 09:25:38 UTC (rev 203568)
+++ branches/safari-602-branch/Source/WebCore/loader/LoaderStrategy.cpp 2016-07-22 09:25:41 UTC (rev 203569)
</span><span class="lines">@@ -34,16 +34,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ResourceLoadSuspender::ResourceLoadSuspender()
-{
- platformStrategies()->loaderStrategy()->suspendPendingRequests();
-}
-
-ResourceLoadSuspender::~ResourceLoadSuspender()
-{
- platformStrategies()->loaderStrategy()->resumePendingRequests();
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreloaderLoaderStrategyh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/loader/LoaderStrategy.h (203568 => 203569)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/loader/LoaderStrategy.h 2016-07-22 09:25:38 UTC (rev 203568)
+++ branches/safari-602-branch/Source/WebCore/loader/LoaderStrategy.h 2016-07-22 09:25:41 UTC (rev 203569)
</span><span class="lines">@@ -65,12 +65,6 @@
</span><span class="cx"> virtual ~LoaderStrategy();
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class ResourceLoadSuspender {
-public:
- ResourceLoadSuspender();
- ~ResourceLoadSuspender();
-};
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // LoaderStrategy_h
</span></span></pre>
</div>
</div>
</body>
</html>