Changeset 148922 in webkit

Timestamp:

Apr 22, 2013 3:56:19 PM (11 years ago)

Author:

andersca@apple.com

Message:

Web process should decide when to continue main resource loads
​https://bugs.webkit.org/show_bug.cgi?id=114995

Reviewed by Sam Weinig.

Main resource loads can be converted to downloads, so we need the ability to let the web process decide when
to continue loading after a response has been received.

• NetworkProcess/NetworkResourceLoader.cpp:

(WebKit::NetworkResourceLoader::didReceiveResponseAsync):
For non-main resources, just call continueDidReceiveResponse directly; there's no need to ping-pong to the web process in that case.

(WebKit::NetworkResourceLoader::continueDidReceiveResponse):
Just call ResourceHandle::continueDidReceiveResponse.

• NetworkProcess/NetworkResourceLoader.messages.in:

Add ContinueDidReceiveResponse message.

• NetworkProcess/SchedulableLoader.cpp:

(WebKit::SchedulableLoader::SchedulableLoader):
Initialize m_isLoadingMainResource.

• NetworkProcess/SchedulableLoader.h:

(WebKit::SchedulableLoader::isLoadingMainResource):
Add getter.

(SchedulableLoader):
Move m_shouldClearReferrerOnHTTPSToHTTPRedirect next to the rest of the booleans.

• Shared/Network/NetworkResourceLoadParameters.cpp:

(WebKit::NetworkResourceLoadParameters::NetworkResourceLoadParameters):
(WebKit::NetworkResourceLoadParameters::encode):
(WebKit::NetworkResourceLoadParameters::decode):

• Shared/Network/NetworkResourceLoadParameters.h:

(NetworkResourceLoadParameters):
Add isMainResource flag.

• WebProcess/Network/WebResourceLoadScheduler.cpp:

(WebKit::WebResourceLoadScheduler::scheduleSubresourceLoad):
Pass the cached resource to scheduleLoad.

(WebKit::WebResourceLoadScheduler::schedulePluginStreamLoad):
Pass null to scheduleLoad.

(WebKit::WebResourceLoadScheduler::scheduleLoad):
Initialize isMainResource.

• WebProcess/Network/WebResourceLoader.cpp:

(WebKit::WebResourceLoader::didReceiveResponseWithCertificateInfo):
If this is a main resource load, send back a ContinueDidReceiveResponse message.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkResourceLoader.cpp (modified) (2 diffs)
• NetworkProcess/NetworkResourceLoader.h (modified) (1 diff)
• NetworkProcess/NetworkResourceLoader.messages.in (modified) (1 diff)
• NetworkProcess/SchedulableLoader.cpp (modified) (1 diff)
• NetworkProcess/SchedulableLoader.h (modified) (3 diffs)
• Shared/Network/NetworkResourceLoadParameters.cpp (modified) (3 diffs)
• Shared/Network/NetworkResourceLoadParameters.h (modified) (1 diff)
• WebProcess/Network/WebResourceLoadScheduler.cpp (modified) (4 diffs)
• WebProcess/Network/WebResourceLoadScheduler.h (modified) (1 diff)
• WebProcess/Network/WebResourceLoader.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-04-22  Anders Carlsson  <andersca@apple.com>
+
+        Web process should decide when to continue main resource loads
+        https://bugs.webkit.org/show_bug.cgi?id=114995
+
+        Reviewed by Sam Weinig.
+
+        Main resource loads can be converted to downloads, so we need the ability to let the web process decide when
+        to continue loading after a response has been received.
+
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::didReceiveResponseAsync):
+        For non-main resources, just call continueDidReceiveResponse directly; there's no need to ping-pong to the web process in that case.
+
+        (WebKit::NetworkResourceLoader::continueDidReceiveResponse):
+        Just call ResourceHandle::continueDidReceiveResponse.
+
+        * NetworkProcess/NetworkResourceLoader.messages.in:
+        Add ContinueDidReceiveResponse message.
+        
+        * NetworkProcess/SchedulableLoader.cpp:
+        (WebKit::SchedulableLoader::SchedulableLoader):
+        Initialize m_isLoadingMainResource.
+
+        * NetworkProcess/SchedulableLoader.h:
+        (WebKit::SchedulableLoader::isLoadingMainResource):
+        Add getter.
+
+        (SchedulableLoader):
+        Move m_shouldClearReferrerOnHTTPSToHTTPRedirect next to the rest of the booleans.
+
+        * Shared/Network/NetworkResourceLoadParameters.cpp:
+        (WebKit::NetworkResourceLoadParameters::NetworkResourceLoadParameters):
+        (WebKit::NetworkResourceLoadParameters::encode):
+        (WebKit::NetworkResourceLoadParameters::decode):
+        * Shared/Network/NetworkResourceLoadParameters.h:
+        (NetworkResourceLoadParameters):
+        Add isMainResource flag.
+
+        * WebProcess/Network/WebResourceLoadScheduler.cpp:
+        (WebKit::WebResourceLoadScheduler::scheduleSubresourceLoad):
+        Pass the cached resource to scheduleLoad.
+
+        (WebKit::WebResourceLoadScheduler::schedulePluginStreamLoad):
+        Pass null to scheduleLoad.
+
+        (WebKit::WebResourceLoadScheduler::scheduleLoad):
+        Initialize isMainResource.
+
+        * WebProcess/Network/WebResourceLoader.cpp:
+        (WebKit::WebResourceLoader::didReceiveResponseWithCertificateInfo):
+        If this is a main resource load, send back a ContinueDidReceiveResponse message.
+
 2013-04-22  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp

@@ -206 +206 @@
     sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveResponseWithCertificateInfo(response, PlatformCertificateInfo(response)));
 
-    m_handle->continueDidReceiveResponse();
+    if (!isLoadingMainResource()) {
+        // For main resources, the web process is responsible for sending back a NetworkResourceLoader::ContinueDidReceiveResponse message.
+        m_handle->continueDidReceiveResponse();
+        return;
+    }
 }
 
@@ -280 +284 @@
 }
 
+void NetworkResourceLoader::continueDidReceiveResponse()
+{
+    m_handle->continueDidReceiveResponse();
+}
+
 void NetworkResourceLoader::didSendData(ResourceHandle*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
 {

trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h

@@ -107 +107 @@
 
     void continueWillSendRequest(const WebCore::ResourceRequest& newRequest);
+    void continueDidReceiveResponse();
 #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
     void continueCanAuthenticateAgainstProtectionSpace(bool);

trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.messages.in

@@ -24 +24 @@
 
     ContinueWillSendRequest(WebCore::ResourceRequest request)
+    ContinueDidReceiveResponse()
     ContinueCanAuthenticateAgainstProtectionSpace(bool canAuthenticate)
 }

trunk/Source/WebKit2/NetworkProcess/SchedulableLoader.cpp

@@ -47 +47 @@
     , m_allowStoredCredentials(parameters.allowStoredCredentials)
     , m_inPrivateBrowsingMode(parameters.inPrivateBrowsingMode)
+    , m_shouldClearReferrerOnHTTPSToHTTPRedirect(parameters.shouldClearReferrerOnHTTPSToHTTPRedirect)
+    , m_isLoadingMainResource(parameters.isMainResource)
     , m_connection(connection)
-    , m_shouldClearReferrerOnHTTPSToHTTPRedirect(parameters.shouldClearReferrerOnHTTPSToHTTPRedirect)
 {
     for (size_t i = 0, count = parameters.requestBodySandboxExtensions.size(); i < count; ++i) {

trunk/Source/WebKit2/NetworkProcess/SchedulableLoader.h

@@ -53 +53 @@
     WebCore::StoredCredentials allowStoredCredentials() const { return m_allowStoredCredentials; }
     bool inPrivateBrowsingMode() const { return m_inPrivateBrowsingMode; }
+    bool isLoadingMainResource() const { return m_isLoadingMainResource; }
 
     NetworkConnectionToWebProcess* connectionToWebProcess() const { return m_connection.get(); }
@@ -81 +82 @@
     WebCore::StoredCredentials m_allowStoredCredentials;
     bool m_inPrivateBrowsingMode;
+    bool m_shouldClearReferrerOnHTTPSToHTTPRedirect;
+    bool m_isLoadingMainResource;
 
     Vector<RefPtr<SandboxExtension> > m_requestBodySandboxExtensions;
@@ -88 +91 @@
     
     RefPtr<HostRecord> m_hostRecord;
-
-    bool m_shouldClearReferrerOnHTTPSToHTTPRedirect;
 };
 

trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp

@@ -47 +47 @@
     , inPrivateBrowsingMode(false)
     , shouldClearReferrerOnHTTPSToHTTPRedirect(true)
+    , isMainResource(false)
 {
 }
@@ -94 +95 @@
     encoder << inPrivateBrowsingMode;
     encoder << shouldClearReferrerOnHTTPSToHTTPRedirect;
+    encoder << isMainResource;
 }
 
@@ -140 +142 @@
     if (!decoder.decode(result.shouldClearReferrerOnHTTPSToHTTPRedirect))
         return false;
+    if (!decoder.decode(result.isMainResource))
+        return false;
 
     return true;

trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h

@@ -61 +61 @@
     bool inPrivateBrowsingMode;
     bool shouldClearReferrerOnHTTPSToHTTPRedirect;
+    bool isMainResource;
 };
 

trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp

@@ -38 +38 @@
 #include "WebProcess.h"
 #include "WebResourceLoader.h"
+#include <WebCore/CachedResource.h>
 #include <WebCore/Document.h>
 #include <WebCore/DocumentLoader.h>
@@ -70 +71 @@
     RefPtr<SubresourceLoader> loader = SubresourceLoader::create(frame, resource, request, options);
     if (loader)
-        scheduleLoad(loader.get(), priority, frame->document()->referrerPolicy() == ReferrerPolicyDefault);
+        scheduleLoad(loader.get(), resource, priority, frame->document()->referrerPolicy() == ReferrerPolicyDefault);
     return loader.release();
 }
@@ -78 +79 @@
     RefPtr<NetscapePlugInStreamLoader> loader = NetscapePlugInStreamLoader::create(frame, client, request);
     if (loader)
-        scheduleLoad(loader.get(), ResourceLoadPriorityLow, frame->document()->referrerPolicy() == ReferrerPolicyDefault);
+        scheduleLoad(loader.get(), 0, ResourceLoadPriorityLow, frame->document()->referrerPolicy() == ReferrerPolicyDefault);
     return loader.release();
 }
 
-void WebResourceLoadScheduler::scheduleLoad(ResourceLoader* resourceLoader, ResourceLoadPriority priority, bool shouldClearReferrerOnHTTPSToHTTPRedirect)
+void WebResourceLoadScheduler::scheduleLoad(ResourceLoader* resourceLoader, CachedResource* resource, ResourceLoadPriority priority, bool shouldClearReferrerOnHTTPSToHTTPRedirect)
 {
     ASSERT(resourceLoader);
@@ -118 +119 @@
     loadParameters.inPrivateBrowsingMode = privateBrowsingEnabled;
     loadParameters.shouldClearReferrerOnHTTPSToHTTPRedirect = shouldClearReferrerOnHTTPSToHTTPRedirect;
+    loadParameters.isMainResource = resource && resource->type() == CachedResource::MainResource;
 
     if (!WebProcess::shared().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::ScheduleResourceLoad(loadParameters), 0)) {

trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h

@@ -64 +64 @@
 
 private:
-    void scheduleLoad(WebCore::ResourceLoader*, WebCore::ResourceLoadPriority, bool shouldClearReferrerOnHTTPSToHTTPRedirect);
+    void scheduleLoad(WebCore::ResourceLoader*, WebCore::CachedResource*, WebCore::ResourceLoadPriority, bool shouldClearReferrerOnHTTPSToHTTPRedirect);
     void scheduleInternallyFailedLoad(WebCore::ResourceLoader*);
     void internallyFailedLoadTimerFired();

trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp

@@ -37 +37 @@
 #include "WebErrors.h"
 #include "WebProcess.h"
+#include <WebCore/DocumentLoader.h>
 #include <WebCore/ResourceBuffer.h>
 #include <WebCore/ResourceError.h>
@@ -105 +106 @@
     responseCopy.setCertificateChain(certificateInfo.certificateChain());
     m_coreLoader->didReceiveResponse(responseCopy);
+
+    if (m_coreLoader == m_coreLoader->documentLoader()->mainResourceLoader())
+        send(Messages::NetworkResourceLoader::ContinueDidReceiveResponse());
 }