<!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>[187703] branches/safari-601.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/187703">187703</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-07-31 19:39:28 -0700 (Fri, 31 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Roll out <a href="http://trac.webkit.org/projects/webkit/changeset/187466">r187466</a>. rdar://problem/21960398</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011branchSourceWebCoreChangeLog">branches/safari-601.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreloaderDocumentLoadercpp">branches/safari-601.1-branch/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreloadercacheCachedResourcecpp">branches/safari-601.1-branch/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreloadercacheCachedResourceh">branches/safari-601.1-branch/Source/WebCore/loader/cache/CachedResource.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187702 => 187703)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-08-01 01:56:57 UTC (rev 187702)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-08-01 02:39:28 UTC (rev 187703)
</span><span class="lines">@@ -1,5 +1,9 @@
</span><span class="cx"> 2015-07-31 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Roll out r187466.
+
+2015-07-31 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r187694.
</span><span class="cx">
</span><span class="cx"> 2015-07-31 Eric Carlson <eric.carlson@apple.com>
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/loader/DocumentLoader.cpp (187702 => 187703)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/loader/DocumentLoader.cpp 2015-08-01 01:56:57 UTC (rev 187702)
+++ branches/safari-601.1-branch/Source/WebCore/loader/DocumentLoader.cpp 2015-08-01 02:39:28 UTC (rev 187703)
</span><span class="lines">@@ -550,10 +550,8 @@
</span><span class="cx"> // We checked application cache for initial URL, now we need to check it for redirected one.
</span><span class="cx"> ASSERT(!m_substituteData.isValid());
</span><span class="cx"> m_applicationCacheHost->maybeLoadMainResourceForRedirect(newRequest, m_substituteData);
</span><del>- if (m_substituteData.isValid()) {
- RELEASE_ASSERT(m_mainResource);
- m_identifierForLoadWithoutResourceLoader = m_mainResource->identifierForLoadWithoutResourceLoader();
- }
</del><ins>+ if (m_substituteData.isValid())
+ m_identifierForLoadWithoutResourceLoader = mainResourceLoader()->identifier();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Ideally we'd stop the I/O until we hear back from the navigation policy delegate
</span><span class="lines">@@ -583,15 +581,10 @@
</span><span class="cx"> // However, from an API perspective, this isn't a cancellation. Therefore, sever our relationship with the network load,
</span><span class="cx"> // but prevent the ResourceLoader from sending ResourceLoadNotifier callbacks.
</span><span class="cx"> RefPtr<ResourceLoader> resourceLoader = mainResourceLoader();
</span><del>- if (resourceLoader) {
- ASSERT(resourceLoader->shouldSendResourceLoadCallbacks());
- resourceLoader->setSendCallbackPolicy(DoNotSendCallbacks);
- }
-
</del><ins>+ ASSERT(resourceLoader->shouldSendResourceLoadCallbacks());
+ resourceLoader->setSendCallbackPolicy(DoNotSendCallbacks);
</ins><span class="cx"> clearMainResource();
</span><del>-
- if (resourceLoader)
- resourceLoader->setSendCallbackPolicy(SendCallbacks);
</del><ins>+ resourceLoader->setSendCallbackPolicy(SendCallbacks);
</ins><span class="cx"> handleSubstituteDataLoadSoon();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/loader/cache/CachedResource.cpp (187702 => 187703)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/loader/cache/CachedResource.cpp 2015-08-01 01:56:57 UTC (rev 187702)
+++ branches/safari-601.1-branch/Source/WebCore/loader/cache/CachedResource.cpp 2015-08-01 02:39:28 UTC (rev 187703)
</span><span class="lines">@@ -405,7 +405,6 @@
</span><span class="cx"> void CachedResource::clearLoader()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_loader);
</span><del>- m_identifierForLoadWithoutResourceLoader = m_loader->identifier();
</del><span class="cx"> m_loader = nullptr;
</span><span class="cx"> deleteIfPossible();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreloadercacheCachedResourceh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/loader/cache/CachedResource.h (187702 => 187703)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/loader/cache/CachedResource.h 2015-08-01 01:56:57 UTC (rev 187702)
+++ branches/safari-601.1-branch/Source/WebCore/loader/cache/CachedResource.h 2015-08-01 02:39:28 UTC (rev 187703)
</span><span class="lines">@@ -260,8 +260,6 @@
</span><span class="cx"> virtual char* getOrCreateReadBuffer(size_t /* requestedSize */, size_t& /* actualSize */) { return nullptr; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- unsigned long identifierForLoadWithoutResourceLoader() const { return m_identifierForLoadWithoutResourceLoader; }
-
</del><span class="cx"> protected:
</span><span class="cx"> void setEncodedSize(unsigned);
</span><span class="cx"> void setDecodedSize(unsigned);
</span><span class="lines">@@ -343,8 +341,6 @@
</span><span class="cx"> HashSet<CachedResourceHandleBase*> m_handlesToRevalidate;
</span><span class="cx">
</span><span class="cx"> RedirectChainCacheStatus m_redirectChainCacheStatus;
</span><del>-
- unsigned long m_identifierForLoadWithoutResourceLoader { 0 };
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class CachedResource::Callback {
</span></span></pre>
</div>
</div>
</body>
</html>