<!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>[169219] branches/safari-537.77-branch/Source</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/169219">169219</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-05-22 14:35:30 -0700 (Thu, 22 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/167635">r167635</a>. <rdar://problem/16975536></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53777branchSourceWebCoreChangeLog">branches/safari-537.77-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53777branchSourceWebCoreWebCoreexpin">branches/safari-537.77-branch/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#branchessafari53777branchSourceWebCoreloaderResourceLoadSchedulercpp">branches/safari-537.77-branch/Source/WebCore/loader/ResourceLoadScheduler.cpp</a></li>
<li><a href="#branchessafari53777branchSourceWebCoreloaderResourceLoadSchedulerh">branches/safari-537.77-branch/Source/WebCore/loader/ResourceLoadScheduler.h</a></li>
<li><a href="#branchessafari53777branchSourceWebCoreloaderResourceLoadercpp">branches/safari-537.77-branch/Source/WebCore/loader/ResourceLoader.cpp</a></li>
<li><a href="#branchessafari53777branchSourceWebKit2ChangeLog">branches/safari-537.77-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari53777branchSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp">branches/safari-537.77-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp</a></li>
<li><a href="#branchessafari53777branchSourceWebKit2NetworkProcessNetworkConnectionToWebProcessh">branches/safari-537.77-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h</a></li>
<li><a href="#branchessafari53777branchSourceWebKit2NetworkProcessNetworkConnectionToWebProcessmessagesin">branches/safari-537.77-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in</a></li>
<li><a href="#branchessafari53777branchSourceWebKit2NetworkProcessNetworkResourceLoadercpp">branches/safari-537.77-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#branchessafari53777branchSourceWebKit2NetworkProcessNetworkResourceLoaderh">branches/safari-537.77-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h</a></li>
<li><a href="#branchessafari53777branchSourceWebKit2SharedNetworkNetworkResourceLoadParameterscpp">branches/safari-537.77-branch/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp</a></li>
<li><a href="#branchessafari53777branchSourceWebKit2SharedNetworkNetworkResourceLoadParametersh">branches/safari-537.77-branch/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h</a></li>
<li><a href="#branchessafari53777branchSourceWebKit2WebProcessNetworkWebResourceLoadSchedulercpp">branches/safari-537.77-branch/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp</a></li>
<li><a href="#branchessafari53777branchSourceWebKit2WebProcessNetworkWebResourceLoadSchedulerh">branches/safari-537.77-branch/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53777branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebCore/ChangeLog (169218 => 169219)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebCore/ChangeLog 2014-05-22 21:16:03 UTC (rev 169218)
+++ branches/safari-537.77-branch/Source/WebCore/ChangeLog 2014-05-22 21:35:30 UTC (rev 169219)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-05-22 Lucas Forschler <lforschler@apple.com>
+
+ Merge r167635
+
+ 2014-04-21 Dan Bernstein <mitz@apple.com>
+
+ WebCore part of <rdar://problem/16631323> Page::setDefersLoading doesn’t do anything when using the Network process
+ https://bugs.webkit.org/show_bug.cgi?id=131939
+
+ Reviewed by David Kilzer.
+
+ * WebCore.exp.in: Exported WebCore::ResourceHandle::setDefersLoading.
+
+ * loader/ResourceLoadScheduler.cpp:
+ (WebCore::ResourceLoadScheduler::setDefersLoading): Added a no-op implementation.
+ * loader/ResourceLoadScheduler.h: Declared new virtual member function setDefersLoading.
+
+ * loader/ResourceLoader.cpp:
+ (WebCore::ResourceLoader::setDefersLoading): Added a call to the above function.
+
</ins><span class="cx"> 2014-05-22 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r167264
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebCore/WebCore.exp.in (169218 => 169219)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebCore/WebCore.exp.in 2014-05-22 21:16:03 UTC (rev 169218)
+++ branches/safari-537.77-branch/Source/WebCore/WebCore.exp.in 2014-05-22 21:35:30 UTC (rev 169219)
</span><span class="lines">@@ -343,6 +343,7 @@
</span><span class="cx"> __ZN7WebCore14ResourceBufferD1Ev
</span><span class="cx"> __ZN7WebCore14ResourceBufferD2Ev
</span><span class="cx"> __ZN7WebCore14ResourceHandle12firstRequestEv
</span><ins>+__ZN7WebCore14ResourceHandle16setDefersLoadingEb
</ins><span class="cx"> __ZN7WebCore14ResourceHandle20forceContentSniffingEv
</span><span class="cx"> __ZN7WebCore14ResourceHandle23continueWillSendRequestERKNS_15ResourceRequestE
</span><span class="cx"> __ZN7WebCore14ResourceHandle25continueWillCacheResponseEP19NSCachedURLResponse
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebCoreloaderResourceLoadSchedulercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebCore/loader/ResourceLoadScheduler.cpp (169218 => 169219)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebCore/loader/ResourceLoadScheduler.cpp 2014-05-22 21:16:03 UTC (rev 169218)
+++ branches/safari-537.77-branch/Source/WebCore/loader/ResourceLoadScheduler.cpp 2014-05-22 21:35:30 UTC (rev 169219)
</span><span class="lines">@@ -160,6 +160,10 @@
</span><span class="cx"> scheduleServePendingRequests();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ResourceLoadScheduler::setDefersLoading(ResourceLoader*, bool)
+{
+}
+
</ins><span class="cx"> void ResourceLoadScheduler::crossOriginRedirectReceived(ResourceLoader* resourceLoader, const KURL& redirectURL)
</span><span class="cx"> {
</span><span class="cx"> HostInformation* oldHost = hostForURL(resourceLoader->url());
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebCoreloaderResourceLoadSchedulerh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebCore/loader/ResourceLoadScheduler.h (169218 => 169219)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebCore/loader/ResourceLoadScheduler.h 2014-05-22 21:16:03 UTC (rev 169218)
+++ branches/safari-537.77-branch/Source/WebCore/loader/ResourceLoadScheduler.h 2014-05-22 21:35:30 UTC (rev 169219)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> virtual PassRefPtr<NetscapePlugInStreamLoader> schedulePluginStreamLoad(Frame*, NetscapePlugInStreamLoaderClient*, const ResourceRequest&);
</span><span class="cx"> virtual void remove(ResourceLoader*);
</span><span class="cx"> virtual void crossOriginRedirectReceived(ResourceLoader*, const KURL& redirectURL);
</span><ins>+ virtual void setDefersLoading(ResourceLoader*, bool);
</ins><span class="cx">
</span><span class="cx"> virtual void servePendingRequests(ResourceLoadPriority minimumPriority = ResourceLoadPriorityVeryLow);
</span><span class="cx"> virtual void suspendPendingRequests();
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebCoreloaderResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebCore/loader/ResourceLoader.cpp (169218 => 169219)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebCore/loader/ResourceLoader.cpp 2014-05-22 21:16:03 UTC (rev 169218)
+++ branches/safari-537.77-branch/Source/WebCore/loader/ResourceLoader.cpp 2014-05-22 21:35:30 UTC (rev 169219)
</span><span class="lines">@@ -170,6 +170,8 @@
</span><span class="cx"> m_deferredRequest = ResourceRequest();
</span><span class="cx"> start();
</span><span class="cx"> }
</span><ins>+
+ platformStrategies()->loaderStrategy()->resourceLoadScheduler()->setDefersLoading(this, defers);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FrameLoader* ResourceLoader::frameLoader() const
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebKit2/ChangeLog (169218 => 169219)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebKit2/ChangeLog 2014-05-22 21:16:03 UTC (rev 169218)
+++ branches/safari-537.77-branch/Source/WebKit2/ChangeLog 2014-05-22 21:35:30 UTC (rev 169219)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2014-05-22 Lucas Forschler <lforschler@apple.com>
+
+ Merge r167635
+
+ 2014-04-21 Dan Bernstein <mitz@apple.com>
+
+ WebKit part of <rdar://problem/16631323> Page::setDefersLoading doesn’t do anything when using the Network process
+ https://bugs.webkit.org/show_bug.cgi?id=131939
+
+ Reviewed by David Kilzer.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::setDefersLoading): Added. Forwards the message to
+ the NetworkResourceLoader.
+ * NetworkProcess/NetworkConnectionToWebProcess.h:
+
+ * NetworkProcess/NetworkConnectionToWebProcess.messages.in: Added SetDefersLoading message.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::NetworkResourceLoader): Initialize new member variable
+ m_defersLoading from the new field in the loader parameters.
+ (WebKit::NetworkResourceLoader::start): Added. Like WebCore::ResourceLoader, if loading is
+ deferred, keep the request in m_deferredRequest and bail out.
+ (WebKit::NetworkResourceLoader::setDefersLoading): Added. Similar to
+ WebCore::ResourceLoader::setDefersLoading.
+ * NetworkProcess/NetworkResourceLoader.h:
+ (WebKit::NetworkResourceLoader::defersLoading):
+
+ * Shared/Network/NetworkResourceLoadParameters.cpp:
+ (WebKit::NetworkResourceLoadParameters::NetworkResourceLoadParameters): Initialize new field
+ defersLoading to false.
+ (WebKit::NetworkResourceLoadParameters::encode): Encode new field.
+ (WebKit::NetworkResourceLoadParameters::decode): Decode new field.
+ * Shared/Network/NetworkResourceLoadParameters.h: Added defersLoading field.
+
+ * WebProcess/Network/WebResourceLoadScheduler.cpp:
+ (WebKit::WebResourceLoadScheduler::scheduleLoad): Populate defersLoading field in the load
+ parameters.
+ (WebKit::WebResourceLoadScheduler::setDefersLoading): Send a message to the Network process.
+ * WebProcess/Network/WebResourceLoadScheduler.h:
+
</ins><span class="cx"> 2014-04-30 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r166810
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (169218 => 169219)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2014-05-22 21:16:03 UTC (rev 169218)
+++ branches/safari-537.77-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2014-05-22 21:35:30 UTC (rev 169219)
</span><span class="lines">@@ -137,6 +137,15 @@
</span><span class="cx"> loader->abort();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkConnectionToWebProcess::setDefersLoading(ResourceLoadIdentifier identifier, bool defers)
+{
+ RefPtr<NetworkResourceLoader> loader = m_networkResourceLoaders.get(identifier);
+ if (!loader)
+ return;
+
+ loader->setDefersLoading(defers);
+}
+
</ins><span class="cx"> void NetworkConnectionToWebProcess::servePendingRequests(uint32_t resourceLoadPriority)
</span><span class="cx"> {
</span><span class="cx"> NetworkProcess::shared().networkResourceLoadScheduler().servePendingRequests(static_cast<ResourceLoadPriority>(resourceLoadPriority));
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebKit2NetworkProcessNetworkConnectionToWebProcessh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h (169218 => 169219)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2014-05-22 21:16:03 UTC (rev 169218)
+++ branches/safari-537.77-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2014-05-22 21:35:30 UTC (rev 169219)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx">
</span><span class="cx"> void removeLoadIdentifier(ResourceLoadIdentifier);
</span><span class="cx"> void crossOriginRedirectReceived(ResourceLoadIdentifier, const WebCore::KURL& redirectURL);
</span><ins>+ void setDefersLoading(ResourceLoadIdentifier, bool);
</ins><span class="cx"> void servePendingRequests(uint32_t resourceLoadPriority);
</span><span class="cx"> void setSerialLoadingEnabled(bool);
</span><span class="cx"> void startDownload(bool privateBrowsingEnabled, uint64_t downloadID, const WebCore::ResourceRequest&);
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebKit2NetworkProcessNetworkConnectionToWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in (169218 => 169219)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2014-05-22 21:16:03 UTC (rev 169218)
+++ branches/safari-537.77-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2014-05-22 21:35:30 UTC (rev 169219)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> ScheduleResourceLoad(WebKit::NetworkResourceLoadParameters resourceLoadParameters)
</span><span class="cx"> PerformSynchronousLoad(WebKit::NetworkResourceLoadParameters resourceLoadParameters) -> (WebCore::ResourceError error, WebCore::ResourceResponse response, Vector<char> data) Delayed
</span><span class="cx"> RemoveLoadIdentifier(uint64_t resourceLoadIdentifier)
</span><ins>+ SetDefersLoading(uint64_t resourceLoadIdentifier, bool defers)
</ins><span class="cx">
</span><span class="cx"> ServePendingRequests(uint32_t resourceLoadPriority)
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (169218 => 169219)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2014-05-22 21:16:03 UTC (rev 169218)
+++ branches/safari-537.77-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2014-05-22 21:35:30 UTC (rev 169219)
</span><span class="lines">@@ -68,6 +68,7 @@
</span><span class="cx"> , m_inPrivateBrowsingMode(parameters.inPrivateBrowsingMode)
</span><span class="cx"> , m_shouldClearReferrerOnHTTPSToHTTPRedirect(parameters.shouldClearReferrerOnHTTPSToHTTPRedirect)
</span><span class="cx"> , m_isLoadingMainResource(parameters.isMainResource)
</span><ins>+ , m_defersLoading(parameters.defersLoading)
</ins><span class="cx"> , m_sandboxExtensionsAreConsumed(false)
</span><span class="cx"> , m_connection(connection)
</span><span class="cx"> {
</span><span class="lines">@@ -130,12 +131,29 @@
</span><span class="cx"> // FIXME (NetworkProcess): Create RemoteNetworkingContext with actual settings.
</span><span class="cx"> m_networkingContext = RemoteNetworkingContext::create(false, false, m_inPrivateBrowsingMode, m_shouldClearReferrerOnHTTPSToHTTPRedirect);
</span><span class="cx">
</span><ins>+ if (m_defersLoading) {
+ m_deferredRequest = m_request;
+ return;
+ }
+
</ins><span class="cx"> consumeSandboxExtensions();
</span><span class="cx">
</span><span class="cx"> // FIXME (NetworkProcess): Pass an actual value for defersLoading
</span><span class="cx"> m_handle = ResourceHandle::create(m_networkingContext.get(), m_request, this, false /* defersLoading */, m_contentSniffingPolicy == SniffContent);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkResourceLoader::setDefersLoading(bool defers)
+{
+ m_defersLoading = defers;
+ if (m_handle)
+ m_handle->setDefersLoading(defers);
+ if (!defers && !m_deferredRequest.isNull()) {
+ m_request = m_deferredRequest;
+ m_deferredRequest = ResourceRequest();
+ start();
+ }
+}
+
</ins><span class="cx"> void NetworkResourceLoader::cleanup()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebKit2NetworkProcessNetworkResourceLoaderh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (169218 => 169219)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2014-05-22 21:16:03 UTC (rev 169218)
+++ branches/safari-537.77-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2014-05-22 21:35:30 UTC (rev 169219)
</span><span class="lines">@@ -78,6 +78,9 @@
</span><span class="cx"> void start();
</span><span class="cx"> void abort();
</span><span class="cx">
</span><ins>+ void setDefersLoading(bool);
+ bool defersLoading() const { return m_defersLoading; }
+
</ins><span class="cx"> // ResourceHandleClient methods
</span><span class="cx"> virtual void willSendRequestAsync(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse) OVERRIDE;
</span><span class="cx"> virtual void didSendData(WebCore::ResourceHandle*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) OVERRIDE;
</span><span class="lines">@@ -171,6 +174,7 @@
</span><span class="cx"> uint64_t m_webPageID;
</span><span class="cx"> uint64_t m_webFrameID;
</span><span class="cx"> WebCore::ResourceRequest m_request;
</span><ins>+ WebCore::ResourceRequest m_deferredRequest;
</ins><span class="cx"> WebCore::ResourceLoadPriority m_priority;
</span><span class="cx"> WebCore::ContentSniffingPolicy m_contentSniffingPolicy;
</span><span class="cx"> WebCore::StoredCredentials m_allowStoredCredentials;
</span><span class="lines">@@ -178,6 +182,7 @@
</span><span class="cx"> bool m_inPrivateBrowsingMode;
</span><span class="cx"> bool m_shouldClearReferrerOnHTTPSToHTTPRedirect;
</span><span class="cx"> bool m_isLoadingMainResource;
</span><ins>+ bool m_defersLoading;
</ins><span class="cx">
</span><span class="cx"> Vector<RefPtr<SandboxExtension>> m_requestBodySandboxExtensions;
</span><span class="cx"> Vector<RefPtr<SandboxExtension>> m_resourceSandboxExtensions;
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebKit2SharedNetworkNetworkResourceLoadParameterscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp (169218 => 169219)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp 2014-05-22 21:16:03 UTC (rev 169218)
+++ branches/safari-537.77-branch/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp 2014-05-22 21:35:30 UTC (rev 169219)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> , inPrivateBrowsingMode(false)
</span><span class="cx"> , shouldClearReferrerOnHTTPSToHTTPRedirect(true)
</span><span class="cx"> , isMainResource(false)
</span><ins>+ , defersLoading(false)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -97,6 +98,7 @@
</span><span class="cx"> encoder << inPrivateBrowsingMode;
</span><span class="cx"> encoder << shouldClearReferrerOnHTTPSToHTTPRedirect;
</span><span class="cx"> encoder << isMainResource;
</span><ins>+ encoder << defersLoading;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool NetworkResourceLoadParameters::decode(CoreIPC::ArgumentDecoder& decoder, NetworkResourceLoadParameters& result)
</span><span class="lines">@@ -147,6 +149,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.isMainResource))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(result.defersLoading))
+ return false;
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebKit2SharedNetworkNetworkResourceLoadParametersh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h (169218 => 169219)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h 2014-05-22 21:16:03 UTC (rev 169218)
+++ branches/safari-537.77-branch/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h 2014-05-22 21:35:30 UTC (rev 169219)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> bool inPrivateBrowsingMode;
</span><span class="cx"> bool shouldClearReferrerOnHTTPSToHTTPRedirect;
</span><span class="cx"> bool isMainResource;
</span><ins>+ bool defersLoading;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebKit2WebProcessNetworkWebResourceLoadSchedulercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp (169218 => 169219)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2014-05-22 21:16:03 UTC (rev 169218)
+++ branches/safari-537.77-branch/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2014-05-22 21:35:30 UTC (rev 169219)
</span><span class="lines">@@ -125,6 +125,7 @@
</span><span class="cx"> loadParameters.inPrivateBrowsingMode = privateBrowsingEnabled;
</span><span class="cx"> loadParameters.shouldClearReferrerOnHTTPSToHTTPRedirect = shouldClearReferrerOnHTTPSToHTTPRedirect;
</span><span class="cx"> loadParameters.isMainResource = resource && resource->type() == CachedResource::MainResource;
</span><ins>+ loadParameters.defersLoading = resourceLoader->defersLoading();
</ins><span class="cx">
</span><span class="cx"> ASSERT((loadParameters.webPageID && loadParameters.webFrameID) || loadParameters.clientCredentialPolicy == DoNotAskClientForAnyCredentials);
</span><span class="cx">
</span><span class="lines">@@ -183,6 +184,12 @@
</span><span class="cx"> loader->detachFromCoreLoader();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebResourceLoadScheduler::setDefersLoading(ResourceLoader* resourceLoader, bool defers)
+{
+ ResourceLoadIdentifier identifier = resourceLoader->identifier();
+ WebProcess::shared().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::SetDefersLoading(identifier, defers), 0);
+}
+
</ins><span class="cx"> void WebResourceLoadScheduler::crossOriginRedirectReceived(ResourceLoader*, const KURL&)
</span><span class="cx"> {
</span><span class="cx"> // We handle cross origin redirects entirely within the NetworkProcess.
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebKit2WebProcessNetworkWebResourceLoadSchedulerh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h (169218 => 169219)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h 2014-05-22 21:16:03 UTC (rev 169218)
+++ branches/safari-537.77-branch/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h 2014-05-22 21:35:30 UTC (rev 169219)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void remove(WebCore::ResourceLoader*) OVERRIDE;
</span><span class="cx"> virtual void crossOriginRedirectReceived(WebCore::ResourceLoader*, const WebCore::KURL& redirectURL) OVERRIDE;
</span><ins>+ virtual void setDefersLoading(WebCore::ResourceLoader*, bool) override;
</ins><span class="cx">
</span><span class="cx"> virtual void servePendingRequests(WebCore::ResourceLoadPriority minimumPriority = WebCore::ResourceLoadPriorityVeryLow) OVERRIDE;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>