Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (193467 => 193468)
--- trunk/Source/WebKit2/CMakeLists.txt 2015-12-04 21:01:43 UTC (rev 193467)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-12-04 21:57:41 UTC (rev 193468)
@@ -563,7 +563,7 @@
WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp
WebProcess/Network/NetworkProcessConnection.cpp
- WebProcess/Network/WebResourceLoadScheduler.cpp
+ WebProcess/Network/WebLoaderStrategy.cpp
WebProcess/Network/WebResourceLoader.cpp
WebProcess/Notifications/NotificationPermissionRequestManager.cpp
Modified: trunk/Source/WebKit2/ChangeLog (193467 => 193468)
--- trunk/Source/WebKit2/ChangeLog 2015-12-04 21:01:43 UTC (rev 193467)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-04 21:57:41 UTC (rev 193468)
@@ -1,3 +1,71 @@
+2015-12-04 Antti Koivisto <[email protected]>
+
+ Rename WebResourceLoadScheduler to WebLoaderStrategy
+ https://bugs.webkit.org/show_bug.cgi?id=151854
+
+ Reviewed by Anders Carlsson.
+
+ It implements WebCore::LoaderStrategy and doesn't do any scheduling.
+
+ * CMakeLists.txt:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/Network/NetworkProcessConnection.cpp:
+ (WebKit::NetworkProcessConnection::didReceiveMessage):
+ * WebProcess/Network/WebLoaderStrategy.cpp: Copied from Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp.
+ (WebKit::WebLoaderStrategy::WebLoaderStrategy):
+ (WebKit::WebLoaderStrategy::~WebLoaderStrategy):
+ (WebKit::WebLoaderStrategy::loadResource):
+ (WebKit::WebLoaderStrategy::schedulePluginStreamLoad):
+ (WebKit::maximumBufferingTime):
+ (WebKit::WebLoaderStrategy::scheduleLoad):
+ (WebKit::WebLoaderStrategy::scheduleInternallyFailedLoad):
+ (WebKit::WebLoaderStrategy::internallyFailedLoadTimerFired):
+ (WebKit::WebLoaderStrategy::startLocalLoad):
+ (WebKit::WebLoaderStrategy::remove):
+ (WebKit::WebLoaderStrategy::setDefersLoading):
+ (WebKit::WebLoaderStrategy::crossOriginRedirectReceived):
+ (WebKit::WebLoaderStrategy::servePendingRequests):
+ (WebKit::WebLoaderStrategy::suspendPendingRequests):
+ (WebKit::WebLoaderStrategy::resumePendingRequests):
+ (WebKit::WebLoaderStrategy::networkProcessCrashed):
+ (WebKit::WebLoaderStrategy::loadResourceSynchronously):
+ (WebKit::WebLoaderStrategy::createPingHandle):
+ (WebKit::WebResourceLoadScheduler::WebResourceLoadScheduler): Deleted.
+ (WebKit::WebResourceLoadScheduler::~WebResourceLoadScheduler): Deleted.
+ (WebKit::WebResourceLoadScheduler::loadResource): Deleted.
+ (WebKit::WebResourceLoadScheduler::schedulePluginStreamLoad): Deleted.
+ (WebKit::WebResourceLoadScheduler::scheduleLoad): Deleted.
+ (WebKit::WebResourceLoadScheduler::scheduleInternallyFailedLoad): Deleted.
+ (WebKit::WebResourceLoadScheduler::internallyFailedLoadTimerFired): Deleted.
+ (WebKit::WebResourceLoadScheduler::startLocalLoad): Deleted.
+ (WebKit::WebResourceLoadScheduler::remove): Deleted.
+ (WebKit::WebResourceLoadScheduler::setDefersLoading): Deleted.
+ (WebKit::WebResourceLoadScheduler::crossOriginRedirectReceived): Deleted.
+ (WebKit::WebResourceLoadScheduler::servePendingRequests): Deleted.
+ (WebKit::WebResourceLoadScheduler::suspendPendingRequests): Deleted.
+ (WebKit::WebResourceLoadScheduler::resumePendingRequests): Deleted.
+ (WebKit::WebResourceLoadScheduler::networkProcessCrashed): Deleted.
+ (WebKit::WebResourceLoadScheduler::loadResourceSynchronously): Deleted.
+ (WebKit::WebResourceLoadScheduler::createPingHandle): Deleted.
+ * WebProcess/Network/WebLoaderStrategy.h: Copied from Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h.
+ (WebKit::WebLoaderStrategy::webResourceLoaderForIdentifier):
+ (WebKit::WebResourceLoadScheduler::webResourceLoaderForIdentifier): Deleted.
+ * WebProcess/Network/WebResourceLoadScheduler.cpp: Removed.
+ * WebProcess/Network/WebResourceLoadScheduler.h: Removed.
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::Stream::start):
+ (WebKit::PluginView::Stream::cancel):
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::createLoaderStrategy):
+ (WebKit::WebPlatformStrategies::createPasteboardStrategy):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::WebProcess):
+ (WebKit::WebProcess::initializeWebProcess):
+ (WebKit::WebProcess::networkProcessConnectionClosed):
+ (WebKit::WebProcess::webLoaderStrategy):
+ (WebKit::WebProcess::webResourceLoadScheduler): Deleted.
+ * WebProcess/WebProcess.h:
+
2015-12-03 Simon Fraser <[email protected]>
Have layer memory use consult the backing store format
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (193467 => 193468)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-12-04 21:01:43 UTC (rev 193467)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-12-04 21:57:41 UTC (rev 193468)
@@ -1051,7 +1051,7 @@
51FA2D7715212E2600C1BA0B /* WKBundleDOMWindowExtension.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51FA2D7515212E1E00C1BA0B /* WKBundleDOMWindowExtension.cpp */; };
51FAEC3A1B0657630009C4E7 /* ChildProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FAEC371B0657310009C4E7 /* ChildProcessMessages.h */; };
51FAEC3B1B0657680009C4E7 /* ChildProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51FAEC361B0657310009C4E7 /* ChildProcessMessageReceiver.cpp */; };
- 51FB08FF1639DE1A00EC324A /* WebResourceLoadScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ABF65616392F1500132A7A /* WebResourceLoadScheduler.cpp */; };
+ 51FB08FF1639DE1A00EC324A /* WebLoaderStrategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ABF65616392F1500132A7A /* WebLoaderStrategy.cpp */; };
51FD18B51651FBAD00DBE1CE /* NetworkResourceLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51FD18B31651FBAD00DBE1CE /* NetworkResourceLoader.cpp */; };
51FD18B61651FBAD00DBE1CE /* NetworkResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FD18B41651FBAD00DBE1CE /* NetworkResourceLoader.h */; };
5272B28A1406985D0096A5D0 /* StatisticsData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5272B2881406985D0096A5D0 /* StatisticsData.cpp */; };
@@ -3199,8 +3199,8 @@
51A8A6171627F5BB000D90E9 /* NetworkProcess.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = NetworkProcess.messages.in; path = NetworkProcess/NetworkProcess.messages.in; sourceTree = "<group>"; };
51A9E1081315CD18009E7031 /* WKKeyValueStorageManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKKeyValueStorageManager.cpp; sourceTree = "<group>"; };
51A9E1091315CD18009E7031 /* WKKeyValueStorageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKKeyValueStorageManager.h; sourceTree = "<group>"; };
- 51ABF65616392F1500132A7A /* WebResourceLoadScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebResourceLoadScheduler.cpp; path = Network/WebResourceLoadScheduler.cpp; sourceTree = "<group>"; };
- 51ABF65716392F1500132A7A /* WebResourceLoadScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebResourceLoadScheduler.h; path = Network/WebResourceLoadScheduler.h; sourceTree = "<group>"; };
+ 51ABF65616392F1500132A7A /* WebLoaderStrategy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebLoaderStrategy.cpp; path = Network/WebLoaderStrategy.cpp; sourceTree = "<group>"; };
+ 51ABF65716392F1500132A7A /* WebLoaderStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebLoaderStrategy.h; path = Network/WebLoaderStrategy.h; sourceTree = "<group>"; };
51ACBB81127A8BAD00D203B9 /* WebContextMenuProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextMenuProxy.h; sourceTree = "<group>"; };
51ACBB9E127A8F2C00D203B9 /* WebContextMenuProxyMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextMenuProxyMac.h; sourceTree = "<group>"; };
51ACBB9F127A8F2C00D203B9 /* WebContextMenuProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContextMenuProxyMac.mm; sourceTree = "<group>"; };
@@ -5566,11 +5566,11 @@
5105B0D4162F7A7A00E27709 /* NetworkProcessConnection.cpp */,
5105B0D5162F7A7A00E27709 /* NetworkProcessConnection.h */,
51FB0902163A3B1C00EC324A /* NetworkProcessConnection.messages.in */,
+ 51ABF65616392F1500132A7A /* WebLoaderStrategy.cpp */,
+ 51ABF65716392F1500132A7A /* WebLoaderStrategy.h */,
510AFFB716542048001BA05E /* WebResourceLoader.cpp */,
510AFFB816542048001BA05E /* WebResourceLoader.h */,
510AFFCE16542CBD001BA05E /* WebResourceLoader.messages.in */,
- 51ABF65616392F1500132A7A /* WebResourceLoadScheduler.cpp */,
- 51ABF65716392F1500132A7A /* WebResourceLoadScheduler.h */,
);
name = Network;
sourceTree = "<group>";
@@ -9980,7 +9980,7 @@
3760881E150413E900FC82C7 /* WebRenderObject.cpp in Sources */,
510AFFB916542048001BA05E /* WebResourceLoader.cpp in Sources */,
51F060E11654318500F3281B /* WebResourceLoaderMessageReceiver.cpp in Sources */,
- 51FB08FF1639DE1A00EC324A /* WebResourceLoadScheduler.cpp in Sources */,
+ 51FB08FF1639DE1A00EC324A /* WebLoaderStrategy.cpp in Sources */,
7C361D721927FA360036A59D /* WebScriptMessageHandler.cpp in Sources */,
D3B9484811FF4B6500032B39 /* WebSearchPopupMenu.cpp in Sources */,
1A4832D61A9CDF96008B4DFE /* WebsiteData.cpp in Sources */,
Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp (193467 => 193468)
--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2015-12-04 21:01:43 UTC (rev 193467)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2015-12-04 21:57:41 UTC (rev 193468)
@@ -29,8 +29,8 @@
#include "DataReference.h"
#include "NetworkConnectionToWebProcessMessages.h"
#include "WebCoreArgumentCoders.h"
+#include "WebLoaderStrategy.h"
#include "WebProcess.h"
-#include "WebResourceLoadScheduler.h"
#include "WebResourceLoaderMessages.h"
#include <WebCore/CachedResource.h>
#include <WebCore/MemoryCache.h>
@@ -54,7 +54,7 @@
void NetworkProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder)
{
if (decoder.messageReceiverName() == Messages::WebResourceLoader::messageReceiverName()) {
- if (WebResourceLoader* webResourceLoader = WebProcess::singleton().webResourceLoadScheduler().webResourceLoaderForIdentifier(decoder.destinationID()))
+ if (WebResourceLoader* webResourceLoader = WebProcess::singleton().webLoaderStrategy().webResourceLoaderForIdentifier(decoder.destinationID()))
webResourceLoader->didReceiveWebResourceLoaderMessage(connection, decoder);
return;
Copied: trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp (from rev 193437, trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp) (0 => 193468)
--- trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp (rev 0)
+++ trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2015-12-04 21:57:41 UTC (rev 193468)
@@ -0,0 +1,337 @@
+/*
+ * Copyright (C) 2012, 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebLoaderStrategy.h"
+
+#include "HangDetectionDisabler.h"
+#include "Logging.h"
+#include "NetworkConnectionToWebProcessMessages.h"
+#include "NetworkProcessConnection.h"
+#include "NetworkResourceLoadParameters.h"
+#include "SessionTracker.h"
+#include "WebCoreArgumentCoders.h"
+#include "WebErrors.h"
+#include "WebFrame.h"
+#include "WebFrameLoaderClient.h"
+#include "WebFrameNetworkingContext.h"
+#include "WebPage.h"
+#include "WebProcess.h"
+#include "WebResourceLoader.h"
+#include <WebCore/ApplicationCacheHost.h>
+#include <WebCore/CachedResource.h>
+#include <WebCore/Document.h>
+#include <WebCore/DocumentLoader.h>
+#include <WebCore/Frame.h>
+#include <WebCore/FrameLoader.h>
+#include <WebCore/NetscapePlugInStreamLoader.h>
+#include <WebCore/PlatformStrategies.h>
+#include <WebCore/ReferrerPolicy.h>
+#include <WebCore/ResourceLoader.h>
+#include <WebCore/SessionID.h>
+#include <WebCore/Settings.h>
+#include <WebCore/SubresourceLoader.h>
+#include <wtf/text/CString.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+WebLoaderStrategy::WebLoaderStrategy()
+ : m_internallyFailedLoadTimer(RunLoop::main(), this, &WebLoaderStrategy::internallyFailedLoadTimerFired)
+{
+}
+
+WebLoaderStrategy::~WebLoaderStrategy()
+{
+}
+
+RefPtr<SubresourceLoader> WebLoaderStrategy::loadResource(Frame* frame, CachedResource* resource, const ResourceRequest& request, const ResourceLoaderOptions& options)
+{
+ RefPtr<SubresourceLoader> loader = SubresourceLoader::create(frame, resource, request, options);
+ if (loader)
+ scheduleLoad(loader.get(), resource, frame->document()->referrerPolicy() == ReferrerPolicyDefault);
+ return loader;
+}
+
+RefPtr<NetscapePlugInStreamLoader> WebLoaderStrategy::schedulePluginStreamLoad(Frame* frame, NetscapePlugInStreamLoaderClient* client, const ResourceRequest& request)
+{
+ RefPtr<NetscapePlugInStreamLoader> loader = NetscapePlugInStreamLoader::create(frame, client, request);
+ if (loader)
+ scheduleLoad(loader.get(), 0, frame->document()->referrerPolicy() == ReferrerPolicyDefault);
+ return loader;
+}
+
+static std::chrono::milliseconds maximumBufferingTime(CachedResource* resource)
+{
+ if (!resource)
+ return 0_ms;
+
+ switch (resource->type()) {
+ case CachedResource::CSSStyleSheet:
+ case CachedResource::Script:
+#if ENABLE(SVG_FONTS)
+ case CachedResource::SVGFontResource:
+#endif
+ case CachedResource::FontResource:
+ return std::chrono::milliseconds::max();
+ case CachedResource::ImageResource:
+ return 500_ms;
+ case CachedResource::MainResource:
+ case CachedResource::RawResource:
+ case CachedResource::SVGDocumentResource:
+#if ENABLE(LINK_PREFETCH)
+ case CachedResource::LinkPrefetch:
+ case CachedResource::LinkSubresource:
+#endif
+#if ENABLE(VIDEO_TRACK)
+ case CachedResource::TextTrackResource:
+#endif
+#if ENABLE(XSLT)
+ case CachedResource::XSLStyleSheet:
+#endif
+ return 0_ms;
+ }
+
+ ASSERT_NOT_REACHED();
+ return 0_ms;
+}
+
+void WebLoaderStrategy::scheduleLoad(ResourceLoader* resourceLoader, CachedResource* resource, bool shouldClearReferrerOnHTTPSToHTTPRedirect)
+{
+ ASSERT(resourceLoader);
+
+ ResourceLoadIdentifier identifier = resourceLoader->identifier();
+ ASSERT(identifier);
+
+#if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
+ // If the DocumentLoader schedules this as an archive resource load,
+ // then we should remember the ResourceLoader in our records but not schedule it in the NetworkProcess.
+ if (resourceLoader->documentLoader()->scheduleArchiveLoad(resourceLoader, resourceLoader->request())) {
+ LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be handled as an archive resource.", resourceLoader->url().string().utf8().data());
+ m_webResourceLoaders.set(identifier, WebResourceLoader::create(resourceLoader));
+ return;
+ }
+#endif
+
+ if (resourceLoader->documentLoader()->applicationCacheHost()->maybeLoadResource(resourceLoader, resourceLoader->request(), resourceLoader->request().url())) {
+ LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be loaded from application cache.", resourceLoader->url().string().utf8().data());
+ m_webResourceLoaders.set(identifier, WebResourceLoader::create(resourceLoader));
+ return;
+ }
+
+ if (resourceLoader->request().url().protocolIsData()) {
+ LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be loaded as data.", resourceLoader->url().string().utf8().data());
+ startLocalLoad(*resourceLoader);
+ return;
+ }
+
+#if USE(QUICK_LOOK)
+ if (resourceLoader->request().url().protocolIs(QLPreviewProtocol())) {
+ LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be handled as a QuickLook resource.", resourceLoader->url().string().utf8().data());
+ startLocalLoad(*resourceLoader);
+ return;
+ }
+#endif
+
+ LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be scheduled with the NetworkProcess with priority %d", resourceLoader->url().string().utf8().data(), static_cast<int>(resourceLoader->request().priority()));
+
+ ContentSniffingPolicy contentSniffingPolicy = resourceLoader->shouldSniffContent() ? SniffContent : DoNotSniffContent;
+ StoredCredentials allowStoredCredentials = resourceLoader->shouldUseCredentialStorage() ? AllowStoredCredentials : DoNotAllowStoredCredentials;
+
+ // FIXME: Some entities in WebCore use WebCore's "EmptyFrameLoaderClient" instead of having a proper WebFrameLoaderClient.
+ // EmptyFrameLoaderClient shouldn't exist and everything should be using a WebFrameLoaderClient,
+ // but in the meantime we have to make sure not to mis-cast.
+ WebFrameLoaderClient* webFrameLoaderClient = toWebFrameLoaderClient(resourceLoader->frameLoader()->client());
+ WebFrame* webFrame = webFrameLoaderClient ? webFrameLoaderClient->webFrame() : 0;
+ WebPage* webPage = webFrame ? webFrame->page() : 0;
+
+ NetworkResourceLoadParameters loadParameters;
+ loadParameters.identifier = identifier;
+ loadParameters.webPageID = webPage ? webPage->pageID() : 0;
+ loadParameters.webFrameID = webFrame ? webFrame->frameID() : 0;
+ loadParameters.sessionID = webPage ? webPage->sessionID() : SessionID::defaultSessionID();
+ loadParameters.request = resourceLoader->request();
+ loadParameters.contentSniffingPolicy = contentSniffingPolicy;
+ loadParameters.allowStoredCredentials = allowStoredCredentials;
+ // If there is no WebFrame then this resource cannot be authenticated with the client.
+ loadParameters.clientCredentialPolicy = (webFrame && webPage && resourceLoader->isAllowedToAskUserForCredentials()) ? AskClientForAllCredentials : DoNotAskClientForAnyCredentials;
+ loadParameters.shouldClearReferrerOnHTTPSToHTTPRedirect = shouldClearReferrerOnHTTPSToHTTPRedirect;
+ loadParameters.defersLoading = resourceLoader->defersLoading();
+ loadParameters.needsCertificateInfo = resourceLoader->shouldIncludeCertificateInfo();
+ loadParameters.maximumBufferingTime = maximumBufferingTime(resource);
+
+ ASSERT((loadParameters.webPageID && loadParameters.webFrameID) || loadParameters.clientCredentialPolicy == DoNotAskClientForAnyCredentials);
+
+ if (!WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::ScheduleResourceLoad(loadParameters), 0)) {
+ // We probably failed to schedule this load with the NetworkProcess because it had crashed.
+ // This load will never succeed so we will schedule it to fail asynchronously.
+ scheduleInternallyFailedLoad(resourceLoader);
+ return;
+ }
+
+ m_webResourceLoaders.set(identifier, WebResourceLoader::create(resourceLoader));
+}
+
+void WebLoaderStrategy::scheduleInternallyFailedLoad(WebCore::ResourceLoader* resourceLoader)
+{
+ m_internallyFailedResourceLoaders.add(resourceLoader);
+ m_internallyFailedLoadTimer.startOneShot(0);
+}
+
+void WebLoaderStrategy::internallyFailedLoadTimerFired()
+{
+ Vector<RefPtr<ResourceLoader>> internallyFailedResourceLoaders;
+ copyToVector(m_internallyFailedResourceLoaders, internallyFailedResourceLoaders);
+
+ for (size_t i = 0; i < internallyFailedResourceLoaders.size(); ++i)
+ internallyFailedResourceLoaders[i]->didFail(internalError(internallyFailedResourceLoaders[i]->url()));
+}
+
+void WebLoaderStrategy::startLocalLoad(WebCore::ResourceLoader& resourceLoader)
+{
+ resourceLoader.start();
+ m_webResourceLoaders.set(resourceLoader.identifier(), WebResourceLoader::create(&resourceLoader));
+}
+
+void WebLoaderStrategy::remove(ResourceLoader* resourceLoader)
+{
+ ASSERT(resourceLoader);
+ LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::remove, url '%s'", resourceLoader->url().string().utf8().data());
+
+ if (m_internallyFailedResourceLoaders.contains(resourceLoader)) {
+ m_internallyFailedResourceLoaders.remove(resourceLoader);
+ return;
+ }
+
+ ResourceLoadIdentifier identifier = resourceLoader->identifier();
+ if (!identifier) {
+ LOG_ERROR("WebLoaderStrategy removing a ResourceLoader that has no identifier.");
+ return;
+ }
+
+ RefPtr<WebResourceLoader> loader = m_webResourceLoaders.take(identifier);
+ // Loader may not be registered if we created it, but haven't scheduled yet (a bundle client can decide to cancel such request via willSendRequest).
+ if (!loader)
+ return;
+
+ WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RemoveLoadIdentifier(identifier), 0);
+
+ // It's possible that this WebResourceLoader might be just about to message back to the NetworkProcess (e.g. ContinueWillSendRequest)
+ // but there's no point in doing so anymore.
+ loader->detachFromCoreLoader();
+}
+
+void WebLoaderStrategy::setDefersLoading(ResourceLoader* resourceLoader, bool defers)
+{
+ ResourceLoadIdentifier identifier = resourceLoader->identifier();
+ WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::SetDefersLoading(identifier, defers), 0);
+}
+
+void WebLoaderStrategy::crossOriginRedirectReceived(ResourceLoader*, const URL&)
+{
+ // We handle cross origin redirects entirely within the NetworkProcess.
+ // We override this call in the WebProcess to make it a no-op.
+}
+
+void WebLoaderStrategy::servePendingRequests(ResourceLoadPriority)
+{
+ // This overrides the base class version.
+ // We don't need to do anything as this is handled by the network process.
+}
+
+void WebLoaderStrategy::suspendPendingRequests()
+{
+ // Network process does keep requests in pending state.
+}
+
+void WebLoaderStrategy::resumePendingRequests()
+{
+ // Network process does keep requests in pending state.
+}
+
+void WebLoaderStrategy::networkProcessCrashed()
+{
+ HashMap<unsigned long, RefPtr<WebResourceLoader>>::iterator end = m_webResourceLoaders.end();
+ for (HashMap<unsigned long, RefPtr<WebResourceLoader>>::iterator i = m_webResourceLoaders.begin(); i != end; ++i)
+ scheduleInternallyFailedLoad(i->value.get()->resourceLoader());
+
+ m_webResourceLoaders.clear();
+}
+
+void WebLoaderStrategy::loadResourceSynchronously(NetworkingContext* context, unsigned long resourceLoadIdentifier, const ResourceRequest& request, StoredCredentials storedCredentials, ClientCredentialPolicy clientCredentialPolicy, ResourceError& error, ResourceResponse& response, Vector<char>& data)
+{
+ WebFrameNetworkingContext* webContext = static_cast<WebFrameNetworkingContext*>(context);
+ // FIXME: Some entities in WebCore use WebCore's "EmptyFrameLoaderClient" instead of having a proper WebFrameLoaderClient.
+ // EmptyFrameLoaderClient shouldn't exist and everything should be using a WebFrameLoaderClient,
+ // but in the meantime we have to make sure not to mis-cast.
+ WebFrameLoaderClient* webFrameLoaderClient = webContext->webFrameLoaderClient();
+ WebFrame* webFrame = webFrameLoaderClient ? webFrameLoaderClient->webFrame() : 0;
+ WebPage* webPage = webFrame ? webFrame->page() : 0;
+
+ NetworkResourceLoadParameters loadParameters;
+ loadParameters.identifier = resourceLoadIdentifier;
+ loadParameters.webPageID = webPage ? webPage->pageID() : 0;
+ loadParameters.webFrameID = webFrame ? webFrame->frameID() : 0;
+ loadParameters.sessionID = webPage ? webPage->sessionID() : SessionID::defaultSessionID();
+ loadParameters.request = request;
+ loadParameters.contentSniffingPolicy = SniffContent;
+ loadParameters.allowStoredCredentials = storedCredentials;
+ loadParameters.clientCredentialPolicy = clientCredentialPolicy;
+ loadParameters.shouldClearReferrerOnHTTPSToHTTPRedirect = context->shouldClearReferrerOnHTTPSToHTTPRedirect();
+
+ data.resize(0);
+
+ HangDetectionDisabler hangDetectionDisabler;
+
+ if (!WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad(loadParameters), Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::Reply(error, response, data), 0)) {
+ response = ResourceResponse();
+ error = internalError(request.url());
+ }
+}
+
+void WebLoaderStrategy::createPingHandle(NetworkingContext* networkingContext, ResourceRequest& request, bool shouldUseCredentialStorage)
+{
+ // It's possible that call to createPingHandle might be made during initial empty Document creation before a NetworkingContext exists.
+ // It is not clear that we should send ping loads during that process anyways.
+ if (!networkingContext)
+ return;
+
+ WebFrameNetworkingContext* webContext = static_cast<WebFrameNetworkingContext*>(networkingContext);
+ WebFrameLoaderClient* webFrameLoaderClient = webContext->webFrameLoaderClient();
+ WebFrame* webFrame = webFrameLoaderClient ? webFrameLoaderClient->webFrame() : nullptr;
+ WebPage* webPage = webFrame ? webFrame->page() : nullptr;
+
+ NetworkResourceLoadParameters loadParameters;
+ loadParameters.request = request;
+ loadParameters.sessionID = webPage ? webPage->sessionID() : SessionID::defaultSessionID();
+ loadParameters.allowStoredCredentials = shouldUseCredentialStorage ? AllowStoredCredentials : DoNotAllowStoredCredentials;
+ loadParameters.shouldClearReferrerOnHTTPSToHTTPRedirect = networkingContext->shouldClearReferrerOnHTTPSToHTTPRedirect();
+
+ WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::LoadPing(loadParameters), 0);
+}
+
+
+} // namespace WebKit
Copied: trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.h (from rev 193437, trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h) (0 => 193468)
--- trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.h (rev 0)
+++ trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.h 2015-12-04 21:57:41 UTC (rev 193468)
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2012, 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebLoaderStrategy_h
+#define WebLoaderStrategy_h
+
+#include "WebResourceLoader.h"
+#include <WebCore/LoaderStrategy.h>
+#include <WebCore/ResourceLoader.h>
+#include <wtf/HashSet.h>
+#include <wtf/RunLoop.h>
+
+namespace WebKit {
+
+class NetworkProcessConnection;
+typedef uint64_t ResourceLoadIdentifier;
+
+class WebLoaderStrategy : public WebCore::LoaderStrategy {
+ WTF_MAKE_NONCOPYABLE(WebLoaderStrategy); WTF_MAKE_FAST_ALLOCATED;
+public:
+ WebLoaderStrategy();
+ ~WebLoaderStrategy() override;
+
+ RefPtr<WebCore::SubresourceLoader> loadResource(WebCore::Frame*, WebCore::CachedResource*, const WebCore::ResourceRequest&, const WebCore::ResourceLoaderOptions&) override;
+ void loadResourceSynchronously(WebCore::NetworkingContext*, unsigned long resourceLoadIdentifier, const WebCore::ResourceRequest&, WebCore::StoredCredentials, WebCore::ClientCredentialPolicy, WebCore::ResourceError&, WebCore::ResourceResponse&, Vector<char>& data) override;
+
+ void remove(WebCore::ResourceLoader*) override;
+ void setDefersLoading(WebCore::ResourceLoader*, bool) override;
+ void crossOriginRedirectReceived(WebCore::ResourceLoader*, const WebCore::URL& redirectURL) override;
+
+ void servePendingRequests(WebCore::ResourceLoadPriority minimumPriority) override;
+
+ void suspendPendingRequests() override;
+ void resumePendingRequests() override;
+
+ void createPingHandle(WebCore::NetworkingContext*, WebCore::ResourceRequest&, bool shouldUseCredentialStorage) override;
+
+ WebResourceLoader* webResourceLoaderForIdentifier(ResourceLoadIdentifier identifier) const { return m_webResourceLoaders.get(identifier); }
+ RefPtr<WebCore::NetscapePlugInStreamLoader> schedulePluginStreamLoad(WebCore::Frame*, WebCore::NetscapePlugInStreamLoaderClient*, const WebCore::ResourceRequest&);
+
+ void networkProcessCrashed();
+
+private:
+ void scheduleLoad(WebCore::ResourceLoader*, WebCore::CachedResource*, bool shouldClearReferrerOnHTTPSToHTTPRedirect);
+ void scheduleInternallyFailedLoad(WebCore::ResourceLoader*);
+ void internallyFailedLoadTimerFired();
+ void startLocalLoad(WebCore::ResourceLoader&);
+
+ HashSet<RefPtr<WebCore::ResourceLoader>> m_internallyFailedResourceLoaders;
+ RunLoop::Timer<WebLoaderStrategy> m_internallyFailedLoadTimer;
+
+ HashMap<unsigned long, RefPtr<WebResourceLoader>> m_webResourceLoaders;
+};
+
+} // namespace WebKit
+
+#endif
Deleted: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp (193467 => 193468)
--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2015-12-04 21:01:43 UTC (rev 193467)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2015-12-04 21:57:41 UTC (rev 193468)
@@ -1,337 +0,0 @@
-/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebResourceLoadScheduler.h"
-
-#include "HangDetectionDisabler.h"
-#include "Logging.h"
-#include "NetworkConnectionToWebProcessMessages.h"
-#include "NetworkProcessConnection.h"
-#include "NetworkResourceLoadParameters.h"
-#include "SessionTracker.h"
-#include "WebCoreArgumentCoders.h"
-#include "WebErrors.h"
-#include "WebFrame.h"
-#include "WebFrameLoaderClient.h"
-#include "WebFrameNetworkingContext.h"
-#include "WebPage.h"
-#include "WebProcess.h"
-#include "WebResourceLoader.h"
-#include <WebCore/ApplicationCacheHost.h>
-#include <WebCore/CachedResource.h>
-#include <WebCore/Document.h>
-#include <WebCore/DocumentLoader.h>
-#include <WebCore/Frame.h>
-#include <WebCore/FrameLoader.h>
-#include <WebCore/NetscapePlugInStreamLoader.h>
-#include <WebCore/PlatformStrategies.h>
-#include <WebCore/ReferrerPolicy.h>
-#include <WebCore/ResourceLoader.h>
-#include <WebCore/SessionID.h>
-#include <WebCore/Settings.h>
-#include <WebCore/SubresourceLoader.h>
-#include <wtf/text/CString.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-WebResourceLoadScheduler::WebResourceLoadScheduler()
- : m_internallyFailedLoadTimer(RunLoop::main(), this, &WebResourceLoadScheduler::internallyFailedLoadTimerFired)
-{
-}
-
-WebResourceLoadScheduler::~WebResourceLoadScheduler()
-{
-}
-
-RefPtr<SubresourceLoader> WebResourceLoadScheduler::loadResource(Frame* frame, CachedResource* resource, const ResourceRequest& request, const ResourceLoaderOptions& options)
-{
- RefPtr<SubresourceLoader> loader = SubresourceLoader::create(frame, resource, request, options);
- if (loader)
- scheduleLoad(loader.get(), resource, frame->document()->referrerPolicy() == ReferrerPolicyDefault);
- return loader;
-}
-
-RefPtr<NetscapePlugInStreamLoader> WebResourceLoadScheduler::schedulePluginStreamLoad(Frame* frame, NetscapePlugInStreamLoaderClient* client, const ResourceRequest& request)
-{
- RefPtr<NetscapePlugInStreamLoader> loader = NetscapePlugInStreamLoader::create(frame, client, request);
- if (loader)
- scheduleLoad(loader.get(), 0, frame->document()->referrerPolicy() == ReferrerPolicyDefault);
- return loader;
-}
-
-static std::chrono::milliseconds maximumBufferingTime(CachedResource* resource)
-{
- if (!resource)
- return 0_ms;
-
- switch (resource->type()) {
- case CachedResource::CSSStyleSheet:
- case CachedResource::Script:
-#if ENABLE(SVG_FONTS)
- case CachedResource::SVGFontResource:
-#endif
- case CachedResource::FontResource:
- return std::chrono::milliseconds::max();
- case CachedResource::ImageResource:
- return 500_ms;
- case CachedResource::MainResource:
- case CachedResource::RawResource:
- case CachedResource::SVGDocumentResource:
-#if ENABLE(LINK_PREFETCH)
- case CachedResource::LinkPrefetch:
- case CachedResource::LinkSubresource:
-#endif
-#if ENABLE(VIDEO_TRACK)
- case CachedResource::TextTrackResource:
-#endif
-#if ENABLE(XSLT)
- case CachedResource::XSLStyleSheet:
-#endif
- return 0_ms;
- }
-
- ASSERT_NOT_REACHED();
- return 0_ms;
-}
-
-void WebResourceLoadScheduler::scheduleLoad(ResourceLoader* resourceLoader, CachedResource* resource, bool shouldClearReferrerOnHTTPSToHTTPRedirect)
-{
- ASSERT(resourceLoader);
-
- ResourceLoadIdentifier identifier = resourceLoader->identifier();
- ASSERT(identifier);
-
-#if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
- // If the DocumentLoader schedules this as an archive resource load,
- // then we should remember the ResourceLoader in our records but not schedule it in the NetworkProcess.
- if (resourceLoader->documentLoader()->scheduleArchiveLoad(resourceLoader, resourceLoader->request())) {
- LOG(NetworkScheduling, "(WebProcess) WebResourceLoadScheduler::scheduleLoad, url '%s' will be handled as an archive resource.", resourceLoader->url().string().utf8().data());
- m_webResourceLoaders.set(identifier, WebResourceLoader::create(resourceLoader));
- return;
- }
-#endif
-
- if (resourceLoader->documentLoader()->applicationCacheHost()->maybeLoadResource(resourceLoader, resourceLoader->request(), resourceLoader->request().url())) {
- LOG(NetworkScheduling, "(WebProcess) WebResourceLoadScheduler::scheduleLoad, url '%s' will be loaded from application cache.", resourceLoader->url().string().utf8().data());
- m_webResourceLoaders.set(identifier, WebResourceLoader::create(resourceLoader));
- return;
- }
-
- if (resourceLoader->request().url().protocolIsData()) {
- LOG(NetworkScheduling, "(WebProcess) WebResourceLoadScheduler::scheduleLoad, url '%s' will be loaded as data.", resourceLoader->url().string().utf8().data());
- startLocalLoad(*resourceLoader);
- return;
- }
-
-#if USE(QUICK_LOOK)
- if (resourceLoader->request().url().protocolIs(QLPreviewProtocol())) {
- LOG(NetworkScheduling, "(WebProcess) WebResourceLoadScheduler::scheduleLoad, url '%s' will be handled as a QuickLook resource.", resourceLoader->url().string().utf8().data());
- startLocalLoad(*resourceLoader);
- return;
- }
-#endif
-
- LOG(NetworkScheduling, "(WebProcess) WebResourceLoadScheduler::scheduleLoad, url '%s' will be scheduled with the NetworkProcess with priority %d", resourceLoader->url().string().utf8().data(), static_cast<int>(resourceLoader->request().priority()));
-
- ContentSniffingPolicy contentSniffingPolicy = resourceLoader->shouldSniffContent() ? SniffContent : DoNotSniffContent;
- StoredCredentials allowStoredCredentials = resourceLoader->shouldUseCredentialStorage() ? AllowStoredCredentials : DoNotAllowStoredCredentials;
-
- // FIXME: Some entities in WebCore use WebCore's "EmptyFrameLoaderClient" instead of having a proper WebFrameLoaderClient.
- // EmptyFrameLoaderClient shouldn't exist and everything should be using a WebFrameLoaderClient,
- // but in the meantime we have to make sure not to mis-cast.
- WebFrameLoaderClient* webFrameLoaderClient = toWebFrameLoaderClient(resourceLoader->frameLoader()->client());
- WebFrame* webFrame = webFrameLoaderClient ? webFrameLoaderClient->webFrame() : 0;
- WebPage* webPage = webFrame ? webFrame->page() : 0;
-
- NetworkResourceLoadParameters loadParameters;
- loadParameters.identifier = identifier;
- loadParameters.webPageID = webPage ? webPage->pageID() : 0;
- loadParameters.webFrameID = webFrame ? webFrame->frameID() : 0;
- loadParameters.sessionID = webPage ? webPage->sessionID() : SessionID::defaultSessionID();
- loadParameters.request = resourceLoader->request();
- loadParameters.contentSniffingPolicy = contentSniffingPolicy;
- loadParameters.allowStoredCredentials = allowStoredCredentials;
- // If there is no WebFrame then this resource cannot be authenticated with the client.
- loadParameters.clientCredentialPolicy = (webFrame && webPage && resourceLoader->isAllowedToAskUserForCredentials()) ? AskClientForAllCredentials : DoNotAskClientForAnyCredentials;
- loadParameters.shouldClearReferrerOnHTTPSToHTTPRedirect = shouldClearReferrerOnHTTPSToHTTPRedirect;
- loadParameters.defersLoading = resourceLoader->defersLoading();
- loadParameters.needsCertificateInfo = resourceLoader->shouldIncludeCertificateInfo();
- loadParameters.maximumBufferingTime = maximumBufferingTime(resource);
-
- ASSERT((loadParameters.webPageID && loadParameters.webFrameID) || loadParameters.clientCredentialPolicy == DoNotAskClientForAnyCredentials);
-
- if (!WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::ScheduleResourceLoad(loadParameters), 0)) {
- // We probably failed to schedule this load with the NetworkProcess because it had crashed.
- // This load will never succeed so we will schedule it to fail asynchronously.
- scheduleInternallyFailedLoad(resourceLoader);
- return;
- }
-
- m_webResourceLoaders.set(identifier, WebResourceLoader::create(resourceLoader));
-}
-
-void WebResourceLoadScheduler::scheduleInternallyFailedLoad(WebCore::ResourceLoader* resourceLoader)
-{
- m_internallyFailedResourceLoaders.add(resourceLoader);
- m_internallyFailedLoadTimer.startOneShot(0);
-}
-
-void WebResourceLoadScheduler::internallyFailedLoadTimerFired()
-{
- Vector<RefPtr<ResourceLoader>> internallyFailedResourceLoaders;
- copyToVector(m_internallyFailedResourceLoaders, internallyFailedResourceLoaders);
-
- for (size_t i = 0; i < internallyFailedResourceLoaders.size(); ++i)
- internallyFailedResourceLoaders[i]->didFail(internalError(internallyFailedResourceLoaders[i]->url()));
-}
-
-void WebResourceLoadScheduler::startLocalLoad(WebCore::ResourceLoader& resourceLoader)
-{
- resourceLoader.start();
- m_webResourceLoaders.set(resourceLoader.identifier(), WebResourceLoader::create(&resourceLoader));
-}
-
-void WebResourceLoadScheduler::remove(ResourceLoader* resourceLoader)
-{
- ASSERT(resourceLoader);
- LOG(NetworkScheduling, "(WebProcess) WebResourceLoadScheduler::remove, url '%s'", resourceLoader->url().string().utf8().data());
-
- if (m_internallyFailedResourceLoaders.contains(resourceLoader)) {
- m_internallyFailedResourceLoaders.remove(resourceLoader);
- return;
- }
-
- ResourceLoadIdentifier identifier = resourceLoader->identifier();
- if (!identifier) {
- LOG_ERROR("WebResourceLoadScheduler removing a ResourceLoader that has no identifier.");
- return;
- }
-
- RefPtr<WebResourceLoader> loader = m_webResourceLoaders.take(identifier);
- // Loader may not be registered if we created it, but haven't scheduled yet (a bundle client can decide to cancel such request via willSendRequest).
- if (!loader)
- return;
-
- WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RemoveLoadIdentifier(identifier), 0);
-
- // It's possible that this WebResourceLoader might be just about to message back to the NetworkProcess (e.g. ContinueWillSendRequest)
- // but there's no point in doing so anymore.
- loader->detachFromCoreLoader();
-}
-
-void WebResourceLoadScheduler::setDefersLoading(ResourceLoader* resourceLoader, bool defers)
-{
- ResourceLoadIdentifier identifier = resourceLoader->identifier();
- WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::SetDefersLoading(identifier, defers), 0);
-}
-
-void WebResourceLoadScheduler::crossOriginRedirectReceived(ResourceLoader*, const URL&)
-{
- // We handle cross origin redirects entirely within the NetworkProcess.
- // We override this call in the WebProcess to make it a no-op.
-}
-
-void WebResourceLoadScheduler::servePendingRequests(ResourceLoadPriority)
-{
- // This overrides the base class version.
- // We don't need to do anything as this is handled by the network process.
-}
-
-void WebResourceLoadScheduler::suspendPendingRequests()
-{
- // Network process does keep requests in pending state.
-}
-
-void WebResourceLoadScheduler::resumePendingRequests()
-{
- // Network process does keep requests in pending state.
-}
-
-void WebResourceLoadScheduler::networkProcessCrashed()
-{
- HashMap<unsigned long, RefPtr<WebResourceLoader>>::iterator end = m_webResourceLoaders.end();
- for (HashMap<unsigned long, RefPtr<WebResourceLoader>>::iterator i = m_webResourceLoaders.begin(); i != end; ++i)
- scheduleInternallyFailedLoad(i->value.get()->resourceLoader());
-
- m_webResourceLoaders.clear();
-}
-
-void WebResourceLoadScheduler::loadResourceSynchronously(NetworkingContext* context, unsigned long resourceLoadIdentifier, const ResourceRequest& request, StoredCredentials storedCredentials, ClientCredentialPolicy clientCredentialPolicy, ResourceError& error, ResourceResponse& response, Vector<char>& data)
-{
- WebFrameNetworkingContext* webContext = static_cast<WebFrameNetworkingContext*>(context);
- // FIXME: Some entities in WebCore use WebCore's "EmptyFrameLoaderClient" instead of having a proper WebFrameLoaderClient.
- // EmptyFrameLoaderClient shouldn't exist and everything should be using a WebFrameLoaderClient,
- // but in the meantime we have to make sure not to mis-cast.
- WebFrameLoaderClient* webFrameLoaderClient = webContext->webFrameLoaderClient();
- WebFrame* webFrame = webFrameLoaderClient ? webFrameLoaderClient->webFrame() : 0;
- WebPage* webPage = webFrame ? webFrame->page() : 0;
-
- NetworkResourceLoadParameters loadParameters;
- loadParameters.identifier = resourceLoadIdentifier;
- loadParameters.webPageID = webPage ? webPage->pageID() : 0;
- loadParameters.webFrameID = webFrame ? webFrame->frameID() : 0;
- loadParameters.sessionID = webPage ? webPage->sessionID() : SessionID::defaultSessionID();
- loadParameters.request = request;
- loadParameters.contentSniffingPolicy = SniffContent;
- loadParameters.allowStoredCredentials = storedCredentials;
- loadParameters.clientCredentialPolicy = clientCredentialPolicy;
- loadParameters.shouldClearReferrerOnHTTPSToHTTPRedirect = context->shouldClearReferrerOnHTTPSToHTTPRedirect();
-
- data.resize(0);
-
- HangDetectionDisabler hangDetectionDisabler;
-
- if (!WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad(loadParameters), Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::Reply(error, response, data), 0)) {
- response = ResourceResponse();
- error = internalError(request.url());
- }
-}
-
-void WebResourceLoadScheduler::createPingHandle(NetworkingContext* networkingContext, ResourceRequest& request, bool shouldUseCredentialStorage)
-{
- // It's possible that call to createPingHandle might be made during initial empty Document creation before a NetworkingContext exists.
- // It is not clear that we should send ping loads during that process anyways.
- if (!networkingContext)
- return;
-
- WebFrameNetworkingContext* webContext = static_cast<WebFrameNetworkingContext*>(networkingContext);
- WebFrameLoaderClient* webFrameLoaderClient = webContext->webFrameLoaderClient();
- WebFrame* webFrame = webFrameLoaderClient ? webFrameLoaderClient->webFrame() : nullptr;
- WebPage* webPage = webFrame ? webFrame->page() : nullptr;
-
- NetworkResourceLoadParameters loadParameters;
- loadParameters.request = request;
- loadParameters.sessionID = webPage ? webPage->sessionID() : SessionID::defaultSessionID();
- loadParameters.allowStoredCredentials = shouldUseCredentialStorage ? AllowStoredCredentials : DoNotAllowStoredCredentials;
- loadParameters.shouldClearReferrerOnHTTPSToHTTPRedirect = networkingContext->shouldClearReferrerOnHTTPSToHTTPRedirect();
-
- WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::LoadPing(loadParameters), 0);
-}
-
-
-} // namespace WebKit
Deleted: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h (193467 => 193468)
--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h 2015-12-04 21:01:43 UTC (rev 193467)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h 2015-12-04 21:57:41 UTC (rev 193468)
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebResourceLoadScheduler_h
-#define WebResourceLoadScheduler_h
-
-#include "WebResourceLoader.h"
-#include <WebCore/LoaderStrategy.h>
-#include <WebCore/ResourceLoader.h>
-#include <wtf/HashSet.h>
-#include <wtf/RunLoop.h>
-
-namespace WebKit {
-
-class NetworkProcessConnection;
-class WebResourceLoadScheduler;
-typedef uint64_t ResourceLoadIdentifier;
-
-class WebResourceLoadScheduler : public WebCore::LoaderStrategy {
- WTF_MAKE_NONCOPYABLE(WebResourceLoadScheduler); WTF_MAKE_FAST_ALLOCATED;
-public:
- WebResourceLoadScheduler();
- virtual ~WebResourceLoadScheduler();
-
- virtual RefPtr<WebCore::SubresourceLoader> loadResource(WebCore::Frame*, WebCore::CachedResource*, const WebCore::ResourceRequest&, const WebCore::ResourceLoaderOptions&) override;
- virtual void loadResourceSynchronously(WebCore::NetworkingContext*, unsigned long resourceLoadIdentifier, const WebCore::ResourceRequest&, WebCore::StoredCredentials, WebCore::ClientCredentialPolicy, WebCore::ResourceError&, WebCore::ResourceResponse&, Vector<char>& data) override;
-
- virtual void remove(WebCore::ResourceLoader*) override;
- virtual void setDefersLoading(WebCore::ResourceLoader*, bool) override;
- virtual void crossOriginRedirectReceived(WebCore::ResourceLoader*, const WebCore::URL& redirectURL) override;
-
- virtual void servePendingRequests(WebCore::ResourceLoadPriority minimumPriority) override;
-
- virtual void suspendPendingRequests() override;
- virtual void resumePendingRequests() override;
-
- virtual void createPingHandle(WebCore::NetworkingContext*, WebCore::ResourceRequest&, bool shouldUseCredentialStorage) override;
-
- WebResourceLoader* webResourceLoaderForIdentifier(ResourceLoadIdentifier identifier) const { return m_webResourceLoaders.get(identifier); }
- RefPtr<WebCore::NetscapePlugInStreamLoader> schedulePluginStreamLoad(WebCore::Frame*, WebCore::NetscapePlugInStreamLoaderClient*, const WebCore::ResourceRequest&);
-
- void networkProcessCrashed();
-
-private:
- void scheduleLoad(WebCore::ResourceLoader*, WebCore::CachedResource*, bool shouldClearReferrerOnHTTPSToHTTPRedirect);
- void scheduleInternallyFailedLoad(WebCore::ResourceLoader*);
- void internallyFailedLoadTimerFired();
- void startLocalLoad(WebCore::ResourceLoader&);
-
- HashSet<RefPtr<WebCore::ResourceLoader>> m_internallyFailedResourceLoaders;
- RunLoop::Timer<WebResourceLoadScheduler> m_internallyFailedLoadTimer;
-
- HashMap<unsigned long, RefPtr<WebResourceLoader>> m_webResourceLoaders;
-};
-
-} // namespace WebKit
-
-#endif // WebResourceLoadScheduler_h
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (193467 => 193468)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2015-12-04 21:01:43 UTC (rev 193467)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2015-12-04 21:57:41 UTC (rev 193468)
@@ -31,10 +31,10 @@
#include "ShareableBitmap.h"
#include "WebCoreArgumentCoders.h"
#include "WebEvent.h"
+#include "WebLoaderStrategy.h"
#include "WebPage.h"
#include "WebPageProxyMessages.h"
#include "WebProcess.h"
-#include "WebResourceLoadScheduler.h"
#include <WebCore/BitmapImage.h>
#include <WebCore/Chrome.h>
#include <WebCore/CookieJar.h>
@@ -160,7 +160,7 @@
Frame* frame = m_pluginView->m_pluginElement->document().frame();
ASSERT(frame);
- m_loader = WebProcess::singleton().webResourceLoadScheduler().schedulePluginStreamLoad(frame, this, m_request);
+ m_loader = WebProcess::singleton().webLoaderStrategy().schedulePluginStreamLoad(frame, this, m_request);
}
void PluginView::Stream::cancel()
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (193467 => 193468)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2015-12-04 21:01:43 UTC (rev 193467)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2015-12-04 21:57:41 UTC (rev 193468)
@@ -41,12 +41,12 @@
#include "WebFrame.h"
#include "WebFrameLoaderClient.h"
#include "WebIDBFactoryBackend.h"
+#include "WebLoaderStrategy.h"
#include "WebPage.h"
#include "WebPasteboardOverrides.h"
#include "WebPasteboardProxyMessages.h"
#include "WebProcess.h"
#include "WebProcessProxyMessages.h"
-#include "WebResourceLoadScheduler.h"
#include <WebCore/Color.h>
#include <WebCore/DocumentLoader.h>
#include <WebCore/IDBFactoryBackendInterface.h>
@@ -91,7 +91,7 @@
LoaderStrategy* WebPlatformStrategies::createLoaderStrategy()
{
- return &WebProcess::singleton().webResourceLoadScheduler();
+ return &WebProcess::singleton().webLoaderStrategy();
}
PasteboardStrategy* WebPlatformStrategies::createPasteboardStrategy()
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (193467 => 193468)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-12-04 21:01:43 UTC (rev 193467)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-12-04 21:57:41 UTC (rev 193468)
@@ -49,6 +49,7 @@
#include "WebFrameNetworkingContext.h"
#include "WebGeolocationManager.h"
#include "WebIconDatabaseProxy.h"
+#include "WebLoaderStrategy.h"
#include "WebMediaCacheManager.h"
#include "WebMediaKeyStorageManager.h"
#include "WebMemorySampler.h"
@@ -60,7 +61,6 @@
#include "WebProcessMessages.h"
#include "WebProcessPoolMessages.h"
#include "WebProcessProxyMessages.h"
-#include "WebResourceLoadScheduler.h"
#include "WebsiteData.h"
#include "WebsiteDataTypes.h"
#include <_javascript_Core/JSLock.h>
@@ -154,8 +154,8 @@
, m_cacheModel(CacheModelDocumentViewer)
, m_fullKeyboardAccessEnabled(false)
, m_textCheckerState()
- , m_iconDatabaseProxy(new WebIconDatabaseProxy(this))
- , m_webResourceLoadScheduler(new WebResourceLoadScheduler)
+ , m_iconDatabaseProxy(*new WebIconDatabaseProxy(this))
+ , m_webLoaderStrategy(*new WebLoaderStrategy)
, m_dnsPrefetchHystereris([this](HysteresisState state) { if (state == HysteresisState::Stopped) m_dnsPrefetchedHosts.clear(); })
#if ENABLE(NETSCAPE_PLUGIN_API)
, m_pluginProcessConnectionManager(PluginProcessConnectionManager::create())
@@ -263,7 +263,7 @@
supplement->initialize(parameters);
#if ENABLE(ICONDATABASE)
- m_iconDatabaseProxy->setEnabled(parameters.iconDatabaseEnabled);
+ m_iconDatabaseProxy.setEnabled(parameters.iconDatabaseEnabled);
#endif
if (!parameters.applicationCacheDirectory.isEmpty())
@@ -999,12 +999,12 @@
m_networkProcessConnection = nullptr;
- m_webResourceLoadScheduler->networkProcessCrashed();
+ m_webLoaderStrategy.networkProcessCrashed();
}
-WebResourceLoadScheduler& WebProcess::webResourceLoadScheduler()
+WebLoaderStrategy& WebProcess::webLoaderStrategy()
{
- return *m_webResourceLoadScheduler;
+ return m_webLoaderStrategy;
}
#if ENABLE(DATABASE_PROCESS)
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (193467 => 193468)
--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-12-04 21:01:43 UTC (rev 193467)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-12-04 21:57:41 UTC (rev 193468)
@@ -78,10 +78,10 @@
class WebConnectionToUIProcess;
class WebFrame;
class WebIconDatabaseProxy;
+class WebLoaderStrategy;
class WebPage;
class WebPageGroupProxy;
class WebProcessSupplement;
-class WebResourceLoadScheduler;
struct WebPageCreationParameters;
struct WebPageGroupData;
struct WebPreferencesStore;
@@ -152,7 +152,7 @@
NetworkProcessConnection* networkConnection();
void networkProcessConnectionClosed(NetworkProcessConnection*);
- WebResourceLoadScheduler& webResourceLoadScheduler();
+ WebLoaderStrategy& webLoaderStrategy();
#if ENABLE(DATABASE_PROCESS)
void webToDatabaseProcessConnectionClosed(WebToDatabaseProcessConnection*);
@@ -330,11 +330,11 @@
TextCheckerState m_textCheckerState;
- WebIconDatabaseProxy* m_iconDatabaseProxy;
+ WebIconDatabaseProxy& m_iconDatabaseProxy;
void ensureNetworkProcessConnection();
RefPtr<NetworkProcessConnection> m_networkProcessConnection;
- WebResourceLoadScheduler* m_webResourceLoadScheduler;
+ WebLoaderStrategy& m_webLoaderStrategy;
HashSet<String> m_dnsPrefetchedHosts;
WebCore::HysteresisActivity m_dnsPrefetchHystereris;
