Changeset 192995 in webkit

Timestamp:

Dec 3, 2015, 4:51:17 AM (9 years ago)

Author:

Antti Koivisto

Message:

Move ResourceLoadScheduler to WebKit1
​https://bugs.webkit.org/show_bug.cgi?id=151743

Reviewed by Alex Christensen.

Source/WebCore:

It is no longer used by WebKit2. Simplify the WebKit/WebCore interface.

• WebCore.xcodeproj/project.pbxproj:
• dom/ContainerNode.cpp:
• dom/Document.cpp:

(WebCore::Document::styleForElementIgnoringPendingStylesheets):

• dom/Document.h:
• loader/DocumentLoader.h:
• loader/LoaderStrategy.cpp:

(WebCore::LoaderStrategy::~LoaderStrategy):
(WebCore::ResourceLoadSuspender::ResourceLoadSuspender):
(WebCore::ResourceLoadSuspender::~ResourceLoadSuspender):
(WebCore::LoaderStrategy::resourceLoadScheduler): Deleted.
(WebCore::LoaderStrategy::loadResourceSynchronously): Deleted.
(WebCore::LoaderStrategy::createBlobRegistry): Deleted.
(WebCore::LoaderStrategy::createPingHandle): Deleted.

• loader/LoaderStrategy.h:

Loading functions implemented on WebKit side move to pure virtual LoaderStrategy.

• loader/ResourceLoadScheduler.cpp: Removed.
• loader/ResourceLoadScheduler.h: Removed.

ResourceLoadScheduler moves to WebKit1 as WebResourceLoadScheduler.

• loader/ResourceLoader.cpp:

(WebCore::ResourceLoader::finishNetworkLoad):
(WebCore::ResourceLoader::setDefersLoading):
(WebCore::ResourceLoader::frameLoader):
(WebCore::ResourceLoader::willSwitchToSubstituteResource):
(WebCore::ResourceLoader::willSendRequestInternal):

• loader/archive/ArchiveResourceCollection.h:
• loader/cache/CachedResource.cpp:

(WebCore::CachedResource::load):

• loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::performPostLoadActions):
(WebCore::CachedResourceLoader::incrementRequestCount):

• platform/PlatformStrategies.h:

(WebCore::PlatformStrategies::pluginStrategy):
(WebCore::PlatformStrategies::blobRegistry):

Move BlobRegistry factory function here from LoaderStrategy as this allows network process to have null loaderStrategy.
(it could be renamed BlobStrategy for consistency later).

(WebCore::PlatformStrategies::PlatformStrategies):

• platform/network/BlobRegistry.cpp:

(WebCore::blobRegistry):
(WebCore::BlobRegistry::~BlobRegistry):

• platform/network/ResourceRequestBase.h:
• style/StyleResolveTree.cpp:

(WebCore::Style::PostResolutionCallbackDisabler::PostResolutionCallbackDisabler):
(WebCore::Style::PostResolutionCallbackDisabler::~PostResolutionCallbackDisabler):

Source/WebKit:

• WebCoreSupport/WebResourceLoadScheduler.cpp: Copied from Source/WebCore/loader/ResourceLoadScheduler.cpp.

(webResourceLoadScheduler):
(WebResourceLoadScheduler::hostForURL):
(WebResourceLoadScheduler::WebResourceLoadScheduler):
(WebResourceLoadScheduler::~WebResourceLoadScheduler):
(WebResourceLoadScheduler::scheduleSubresourceLoad):
(WebResourceLoadScheduler::loadResourceSynchronously):
(WebResourceLoadScheduler::schedulePluginStreamLoad):
(WebResourceLoadScheduler::scheduleLoad):
(WebResourceLoadScheduler::remove):
(WebResourceLoadScheduler::setDefersLoading):
(WebResourceLoadScheduler::crossOriginRedirectReceived):
(WebResourceLoadScheduler::servePendingRequests):
(WebResourceLoadScheduler::suspendPendingRequests):
(WebResourceLoadScheduler::resumePendingRequests):
(WebResourceLoadScheduler::scheduleServePendingRequests):
(WebResourceLoadScheduler::requestTimerFired):
(WebResourceLoadScheduler::HostInformation::HostInformation):
(WebResourceLoadScheduler::HostInformation::~HostInformation):
(WebResourceLoadScheduler::HostInformation::priorityToIndex):
(WebResourceLoadScheduler::HostInformation::schedule):
(WebResourceLoadScheduler::HostInformation::addLoadInProgress):
(WebResourceLoadScheduler::HostInformation::remove):
(WebResourceLoadScheduler::HostInformation::hasRequests):
(WebResourceLoadScheduler::HostInformation::limitRequests):
(WebResourceLoadScheduler::createPingHandle):
(WebCore::ResourceLoadScheduler::hostForURL): Deleted.
(WebCore::resourceLoadScheduler): Deleted.
(WebCore::ResourceLoadScheduler::ResourceLoadScheduler): Deleted.
(WebCore::ResourceLoadScheduler::~ResourceLoadScheduler): Deleted.
(WebCore::ResourceLoadScheduler::scheduleSubresourceLoad): Deleted.
(WebCore::ResourceLoadScheduler::schedulePluginStreamLoad): Deleted.
(WebCore::ResourceLoadScheduler::scheduleLoad): Deleted.
(WebCore::ResourceLoadScheduler::remove): Deleted.
(WebCore::ResourceLoadScheduler::setDefersLoading): Deleted.
(WebCore::ResourceLoadScheduler::crossOriginRedirectReceived): Deleted.
(WebCore::ResourceLoadScheduler::servePendingRequests): Deleted.
(WebCore::ResourceLoadScheduler::suspendPendingRequests): Deleted.
(WebCore::ResourceLoadScheduler::resumePendingRequests): Deleted.
(WebCore::ResourceLoadScheduler::scheduleServePendingRequests): Deleted.
(WebCore::ResourceLoadScheduler::requestTimerFired): Deleted.
(WebCore::ResourceLoadScheduler::HostInformation::HostInformation): Deleted.
(WebCore::ResourceLoadScheduler::HostInformation::~HostInformation): Deleted.
(WebCore::ResourceLoadScheduler::HostInformation::priorityToIndex): Deleted.
(WebCore::ResourceLoadScheduler::HostInformation::schedule): Deleted.
(WebCore::ResourceLoadScheduler::HostInformation::addLoadInProgress): Deleted.
(WebCore::ResourceLoadScheduler::HostInformation::remove): Deleted.
(WebCore::ResourceLoadScheduler::HostInformation::hasRequests): Deleted.
(WebCore::ResourceLoadScheduler::HostInformation::limitRequests): Deleted.

• WebCoreSupport/WebResourceLoadScheduler.h: Copied from Source/WebCore/loader/ResourceLoadScheduler.h.

(WebResourceLoadScheduler::isSerialLoadingEnabled):
(WebResourceLoadScheduler::setSerialLoadingEnabled):
(WebResourceLoadScheduler::HostInformation::name):
(WebResourceLoadScheduler::HostInformation::requestsPending):
(WebCore::ResourceLoadScheduler::isSerialLoadingEnabled): Deleted.
(WebCore::ResourceLoadScheduler::setSerialLoadingEnabled): Deleted.
(WebCore::ResourceLoadScheduler::Suspender::Suspender): Deleted.
(WebCore::ResourceLoadScheduler::Suspender::~Suspender): Deleted.
(WebCore::ResourceLoadScheduler::HostInformation::name): Deleted.
(WebCore::ResourceLoadScheduler::HostInformation::requestsPending): Deleted.

• WebKit.xcodeproj/project.pbxproj:

Source/WebKit/mac:

• Plugins/Hosted/HostedNetscapePluginStream.mm:

(WebKit::HostedNetscapePluginStream::start):
(WebKit::HostedNetscapePluginStream::stop):

• Plugins/WebNetscapePluginStream.mm:

(WebNetscapePluginStream::start):
(WebNetscapePluginStream::stop):

• WebCoreSupport/WebPlatformStrategies.h:
• WebCoreSupport/WebPlatformStrategies.mm:

(WebPlatformStrategies::createLoaderStrategy):
(WebPlatformStrategies::createPasteboardStrategy):
(WebPlatformStrategies::createPluginStrategy):
(WebPlatformStrategies::createBlobRegistry):
(WebPlatformStrategies::cookiesForDOM):

• WebView/WebView.mm:

(-[WebView _dispatchPendingLoadRequests]):
(+[WebView _setLoadResourcesSerially:]):
(+[WebView _HTTPPipeliningEnabled]):

Source/WebKit2:

• NetworkProcess/NetworkProcessPlatformStrategies.cpp:

(WebKit::NetworkProcessPlatformStrategies::createCookiesStrategy):
(WebKit::NetworkProcessPlatformStrategies::createLoaderStrategy):
(WebKit::NetworkProcessPlatformStrategies::createPasteboardStrategy):
(WebKit::NetworkProcessPlatformStrategies::createPluginStrategy):
(WebKit::NetworkProcessPlatformStrategies::createBlobRegistry):
(WebKit::NetworkProcessPlatformStrategies::resourceLoadScheduler): Deleted.
(WebKit::NetworkProcessPlatformStrategies::loadResourceSynchronously): Deleted.

• NetworkProcess/NetworkProcessPlatformStrategies.h:
• WebProcess/InjectedBundle/InjectedBundle.cpp:
• WebProcess/Network/WebResourceLoadScheduler.cpp:

(WebKit::WebResourceLoadScheduler::~WebResourceLoadScheduler):
(WebKit::WebResourceLoadScheduler::loadResource):
(WebKit::WebResourceLoadScheduler::resumePendingRequests):
(WebKit::WebResourceLoadScheduler::networkProcessCrashed):
(WebKit::WebResourceLoadScheduler::loadResourceSynchronously):
(WebKit::WebResourceLoadScheduler::createPingHandle):
(WebKit::WebResourceLoadScheduler::scheduleSubresourceLoad): Deleted.
(WebKit::WebResourceLoadScheduler::setSerialLoadingEnabled): Deleted.

• WebProcess/Network/WebResourceLoadScheduler.h:

(WebKit::WebResourceLoadScheduler::webResourceLoaderForIdentifier):

• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::Stream::start):
(WebKit::PluginView::Stream::cancel):

• WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:

(WebKit::WebPlatformStrategies::createLoaderStrategy):
(WebKit::WebPlatformStrategies::createPasteboardStrategy):
(WebKit::WebPlatformStrategies::createPluginStrategy):
(WebKit::WebPlatformStrategies::createBlobRegistry):
(WebKit::WebPlatformStrategies::cookiesForDOM):
(WebKit::WebPlatformStrategies::deleteCookie):
(WebKit::WebPlatformStrategies::refreshPlugins):
(WebKit::WebPlatformStrategies::resourceLoadScheduler): Deleted.
(WebKit::WebPlatformStrategies::loadResourceSynchronously): Deleted.
(WebKit::WebPlatformStrategies::createPingHandle): Deleted.

• WebProcess/WebCoreSupport/WebPlatformStrategies.h:

Location:

trunk/Source

Files:

• WebCore/CMakeLists.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.vcxproj/WebCore.vcxproj (modified) (2 diffs)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (5 diffs)
• WebCore/dom/ContainerNode.cpp (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (2 diffs)
• WebCore/dom/Document.h (modified) (1 diff)
• WebCore/loader/DocumentLoader.h (modified) (1 diff)
• WebCore/loader/LoaderStrategy.cpp (modified) (2 diffs)
• WebCore/loader/LoaderStrategy.h (modified) (3 diffs)
• WebCore/loader/ResourceLoader.cpp (modified) (5 diffs)
• WebCore/loader/archive/ArchiveResourceCollection.h (modified) (1 diff)
• WebCore/loader/cache/CachedResource.cpp (modified) (2 diffs)
• WebCore/loader/cache/CachedResourceLoader.cpp (modified) (2 diffs)
• WebCore/platform/PlatformStrategies.h (modified) (3 diffs)
• WebCore/platform/RuntimeApplicationChecksIOS.h (modified) (1 diff)
• WebCore/platform/network/BlobRegistry.cpp (modified) (1 diff)
• WebCore/platform/network/ResourceRequestBase.h (modified) (1 diff)
• WebCore/style/StyleResolveTree.cpp (modified) (3 diffs)
• WebKit/CMakeLists.txt (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebCoreSupport/WebResourceLoadScheduler.cpp (moved) (moved from trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp ) (19 diffs)
• WebKit/WebCoreSupport/WebResourceLoadScheduler.h (moved) (moved from trunk/Source/WebCore/loader/ResourceLoadScheduler.h ) (7 diffs)
• WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj (modified) (2 diffs)
• WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters (modified) (2 diffs)
• WebKit/WebKit.xcodeproj/project.pbxproj (modified) (5 diffs)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.mm (modified) (2 diffs)
• WebKit/mac/Plugins/WebNetscapePluginStream.mm (modified) (3 diffs)
• WebKit/mac/WebCoreSupport/WebPlatformStrategies.h (modified) (4 diffs)
• WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm (modified) (2 diffs)
• WebKit/mac/WebView/WebView.mm (modified) (5 diffs)
• WebKit/win/Plugins/PluginStream.cpp (modified) (2 diffs)
• WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp (modified) (3 diffs)
• WebKit/win/WebCoreSupport/WebPlatformStrategies.h (modified) (2 diffs)
• WebKit/win/WebView.cpp (modified) (4 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.cpp (modified) (1 diff)
• WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.h (modified) (2 diffs)
• WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (modified) (1 diff)
• WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp (modified) (6 diffs)
• WebKit2/WebProcess/Network/WebResourceLoadScheduler.h (modified) (4 diffs)
• WebKit2/WebProcess/Plugins/PluginView.cpp (modified) (3 diffs)
• WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (modified) (3 diffs)
• WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h (modified) (3 diffs)

trunk/Source/WebCore/CMakeLists.txt

@@ -1952 +1952 @@
     loader/ProgressTracker.cpp
     loader/ResourceLoadNotifier.cpp
-    loader/ResourceLoadScheduler.cpp
     loader/ResourceLoader.cpp
     loader/SinkDocument.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-12-02  Antti Koivisto  <antti@apple.com>
+
+        Move ResourceLoadScheduler to WebKit1
+        https://bugs.webkit.org/show_bug.cgi?id=151743
+
+        Reviewed by Alex Christensen.
+
+        It is no longer used by WebKit2. Simplify the WebKit/WebCore interface.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * dom/ContainerNode.cpp:
+        * dom/Document.cpp:
+        (WebCore::Document::styleForElementIgnoringPendingStylesheets):
+        * dom/Document.h:
+        * loader/DocumentLoader.h:
+        * loader/LoaderStrategy.cpp:
+        (WebCore::LoaderStrategy::~LoaderStrategy):
+        (WebCore::ResourceLoadSuspender::ResourceLoadSuspender):
+        (WebCore::ResourceLoadSuspender::~ResourceLoadSuspender):
+        (WebCore::LoaderStrategy::resourceLoadScheduler): Deleted.
+        (WebCore::LoaderStrategy::loadResourceSynchronously): Deleted.
+        (WebCore::LoaderStrategy::createBlobRegistry): Deleted.
+        (WebCore::LoaderStrategy::createPingHandle): Deleted.
+        * loader/LoaderStrategy.h:
+
+            Loading functions implemented on WebKit side move to pure virtual LoaderStrategy.
+
+        * loader/ResourceLoadScheduler.cpp: Removed.
+        * loader/ResourceLoadScheduler.h: Removed.
+
+            ResourceLoadScheduler moves to WebKit1 as WebResourceLoadScheduler.
+
+        * loader/ResourceLoader.cpp:
+        (WebCore::ResourceLoader::finishNetworkLoad):
+        (WebCore::ResourceLoader::setDefersLoading):
+        (WebCore::ResourceLoader::frameLoader):
+        (WebCore::ResourceLoader::willSwitchToSubstituteResource):
+        (WebCore::ResourceLoader::willSendRequestInternal):
+        * loader/archive/ArchiveResourceCollection.h:
+        * loader/cache/CachedResource.cpp:
+        (WebCore::CachedResource::load):
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::performPostLoadActions):
+        (WebCore::CachedResourceLoader::incrementRequestCount):
+        * platform/PlatformStrategies.h:
+        (WebCore::PlatformStrategies::pluginStrategy):
+        (WebCore::PlatformStrategies::blobRegistry):
+
+            Move BlobRegistry factory function here from LoaderStrategy as this allows network process to have null loaderStrategy.
+            (it could be renamed BlobStrategy for consistency later).
+
+        (WebCore::PlatformStrategies::PlatformStrategies):
+        * platform/network/BlobRegistry.cpp:
+        (WebCore::blobRegistry):
+        (WebCore::BlobRegistry::~BlobRegistry):
+        * platform/network/ResourceRequestBase.h:
+        * style/StyleResolveTree.cpp:
+        (WebCore::Style::PostResolutionCallbackDisabler::PostResolutionCallbackDisabler):
+        (WebCore::Style::PostResolutionCallbackDisabler::~PostResolutionCallbackDisabler):
+
 2015-12-02  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

@@ -7419 +7419 @@
     <ClCompile Include="..\loader\cf\ResourceLoaderCFNet.cpp" />
     <ClCompile Include="..\loader\ResourceLoadNotifier.cpp" />
-    <ClCompile Include="..\loader\ResourceLoadScheduler.cpp" />
     <ClCompile Include="..\loader\SinkDocument.cpp" />
     <ClCompile Include="..\loader\SubframeLoader.cpp" />
@@ -20840 +20839 @@
     <ClInclude Include="..\loader\ResourceLoaderOptions.h" />
     <ClInclude Include="..\loader\ResourceLoadNotifier.h" />
-    <ClInclude Include="..\loader\ResourceLoadScheduler.h" />
     <ClInclude Include="..\loader\SinkDocument.h" />
     <ClInclude Include="..\loader\SubframeLoader.h" />

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -6172 +6172 @@
                 D0BD4F5C1408850F006839B6 /* DictationCommandIOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0BD4F5A1408850F006839B6 /* DictationCommandIOS.cpp */; };
                 D0BD4F5D1408850F006839B6 /* DictationCommandIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = D0BD4F5B1408850F006839B6 /* DictationCommandIOS.h */; };
-                D0CE58F8125E4CC200F3F199 /* ResourceLoadScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0CE58F6125E4CC200F3F199 /* ResourceLoadScheduler.cpp */; };
-                D0CE58F9125E4CC200F3F199 /* ResourceLoadScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = D0CE58F7125E4CC200F3F199 /* ResourceLoadScheduler.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 D0EDA774143E303C0028E383 /* CachedRawResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0EDA772143E303C0028E383 /* CachedRawResource.cpp */; };
                 D0EDA775143E303C0028E383 /* CachedRawResource.h in Headers */ = {isa = PBXBuildFile; fileRef = D0EDA773143E303C0028E383 /* CachedRawResource.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -14071 +14069 @@
                 D0BD4F5A1408850F006839B6 /* DictationCommandIOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DictationCommandIOS.cpp; sourceTree = "<group>"; };
                 D0BD4F5B1408850F006839B6 /* DictationCommandIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DictationCommandIOS.h; sourceTree = "<group>"; };
-                D0CE58F6125E4CC200F3F199 /* ResourceLoadScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceLoadScheduler.cpp; sourceTree = "<group>"; };
-                D0CE58F7125E4CC200F3F199 /* ResourceLoadScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceLoadScheduler.h; sourceTree = "<group>"; };
                 D0EDA772143E303C0028E383 /* CachedRawResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachedRawResource.cpp; sourceTree = "<group>"; };
                 D0EDA773143E303C0028E383 /* CachedRawResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedRawResource.h; sourceTree = "<group>"; };
@@ -22465 +22461 @@
                                 973E325410883B7C005BC493 /* ResourceLoadNotifier.cpp */,
                                 973E325510883B7C005BC493 /* ResourceLoadNotifier.h */,
-                                D0CE58F6125E4CC200F3F199 /* ResourceLoadScheduler.cpp */,
-                                D0CE58F7125E4CC200F3F199 /* ResourceLoadScheduler.h */,
                                 51327D5F11A33A2B004F9D65 /* SinkDocument.cpp */,
                                 51327D5E11A33A2B004F9D65 /* SinkDocument.h */,
@@ -27292 +27286 @@
                                 973E325710883B7C005BC493 /* ResourceLoadNotifier.h in Headers */,
                                 E4295FA412B0614E00D1ACE0 /* ResourceLoadPriority.h in Headers */,
-                                D0CE58F9125E4CC200F3F199 /* ResourceLoadScheduler.h in Headers */,
                                 8A81BF8511DCFD9000DA2B98 /* ResourceLoadTiming.h in Headers */,
                                 7EE6846D12D26E3800E79415 /* ResourceRequest.h in Headers */,
@@ -30870 +30863 @@
                                 51EE7B3A1AA5123100F92B21 /* ResourceLoadInfo.cpp in Sources */,
                                 973E325610883B7C005BC493 /* ResourceLoadNotifier.cpp in Sources */,
-                                D0CE58F8125E4CC200F3F199 /* ResourceLoadScheduler.cpp in Sources */,
                                 514C767C0CE923A1007EF3CD /* ResourceRequestBase.cpp in Sources */,
                                 7EE6846E12D26E3800E79415 /* ResourceRequestCFNet.cpp in Sources */,

trunk/Source/WebCore/dom/ContainerNode.cpp

@@ -50 +50 @@
 #include "RenderTheme.h"
 #include "RenderWidget.h"
-#include "ResourceLoadScheduler.h"
 #include "RootInlineBox.h"
 #include "SVGDocumentExtensions.h"

trunk/Source/WebCore/dom/Document.cpp

@@ -127 +127 @@
 #include "RenderView.h"
 #include "RenderWidget.h"
-#include "ResourceLoadScheduler.h"
 #include "RuntimeEnabledFeatures.h"
 #include "SVGDocumentExtensions.h"
@@ -1960 +1959 @@
 
     // On iOS request delegates called during styleForElement may result in re-entering WebKit and killing the style resolver.
-    ResourceLoadScheduler::Suspender suspender(*platformStrategies()->loaderStrategy()->resourceLoadScheduler());
+    ResourceLoadSuspender suspender;
 
     TemporaryChange<bool> change(m_ignorePendingStylesheets, true);

trunk/Source/WebCore/dom/Document.h

@@ -512 +512 @@
     void notifyRemovePendingSheetIfNeeded();
 
-    bool haveStylesheetsLoaded() const;
+    WEBCORE_EXPORT bool haveStylesheetsLoaded() const;
 
     // This is a DOM function.

trunk/Source/WebCore/loader/DocumentLoader.h

@@ -162 +162 @@
 
         // Return the ArchiveResource for the URL only when loading an Archive
-        ArchiveResource* archiveResourceForURL(const URL&) const;
+        WEBCORE_EXPORT ArchiveResource* archiveResourceForURL(const URL&) const;
 
         WEBCORE_EXPORT PassRefPtr<ArchiveResource> mainResource() const;

trunk/Source/WebCore/loader/LoaderStrategy.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012, 2015 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27 +27 @@
 #include "LoaderStrategy.h"
 
-#include "BlobRegistryImpl.h"
-#include "PingHandle.h"
-#include "ResourceHandle.h"
-#include "ResourceLoadScheduler.h"
+#include "PlatformStrategies.h"
 
 namespace WebCore {
 
-ResourceLoadScheduler* LoaderStrategy::resourceLoadScheduler()
+LoaderStrategy::~LoaderStrategy()
 {
-    return WebCore::resourceLoadScheduler();
 }
 
-void LoaderStrategy::loadResourceSynchronously(NetworkingContext* context, unsigned long, const ResourceRequest& request, StoredCredentials storedCredentials, ClientCredentialPolicy, ResourceError& error, ResourceResponse& response, Vector<char>& data)
+ResourceLoadSuspender::ResourceLoadSuspender()
 {
-    ResourceHandle::loadResourceSynchronously(context, request, storedCredentials, error, response, data);
+    platformStrategies()->loaderStrategy()->suspendPendingRequests();
 }
 
-BlobRegistry* LoaderStrategy::createBlobRegistry()
+ResourceLoadSuspender::~ResourceLoadSuspender()
 {
-    return new BlobRegistryImpl;
-}
-
-void LoaderStrategy::createPingHandle(NetworkingContext* networkingContext, ResourceRequest& request, bool shouldUseCredentialStorage)
-{
-    // PingHandle manages its own lifetime, deleting itself when its purpose has been fulfilled.
-    new PingHandle(networkingContext, request, shouldUseCredentialStorage, PingHandle::UsesAsyncCallbacks::No);
+    platformStrategies()->loaderStrategy()->resumePendingRequests();
 }
 
 } // namespace WebCore
+
+

trunk/Source/WebCore/loader/LoaderStrategy.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012, 2015 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28 +28 @@
 
 #include "ResourceHandleTypes.h"
+#include "ResourceLoadPriority.h"
+#include "ResourceLoaderOptions.h"
 #include <wtf/Vector.h>
 
@@ -33 +35 @@
 
 class BlobRegistry;
+class CachedResource;
 class Frame;
+class NetscapePlugInStreamLoader;
+class NetscapePlugInStreamLoaderClient;
 class NetworkingContext;
 class ResourceError;
-class ResourceLoadScheduler;
+class ResourceLoader;
 class ResourceRequest;
 class ResourceResponse;
+class SubresourceLoader;
+class URL;
 
 class WEBCORE_EXPORT LoaderStrategy {
 public:
-    virtual ResourceLoadScheduler* resourceLoadScheduler();
+    virtual RefPtr<SubresourceLoader> loadResource(Frame*, CachedResource*, const ResourceRequest&, const ResourceLoaderOptions&) = 0;
+    virtual void loadResourceSynchronously(NetworkingContext*, unsigned long identifier, const ResourceRequest&, StoredCredentials, ClientCredentialPolicy, ResourceError&, ResourceResponse&, Vector<char>& data) = 0;
 
-    virtual void loadResourceSynchronously(NetworkingContext*, unsigned long identifier, const ResourceRequest&, StoredCredentials, ClientCredentialPolicy, ResourceError&, ResourceResponse&, Vector<char>& data);
+    virtual void remove(ResourceLoader*) = 0;
+    virtual void setDefersLoading(ResourceLoader*, bool) = 0;
+    virtual void crossOriginRedirectReceived(ResourceLoader*, const URL& redirectURL) = 0;
 
-    virtual BlobRegistry* createBlobRegistry();
+    virtual void servePendingRequests(ResourceLoadPriority minimumPriority = ResourceLoadPriority::VeryLow) = 0;
+    virtual void suspendPendingRequests() = 0;
+    virtual void resumePendingRequests() = 0;
 
-    virtual void createPingHandle(NetworkingContext*, ResourceRequest&, bool shouldUseCredentialStorage);
+    virtual void createPingHandle(NetworkingContext*, ResourceRequest&, bool shouldUseCredentialStorage) = 0;
 
 protected:
-    virtual ~LoaderStrategy()
-    {
-    }
+    virtual ~LoaderStrategy();
+};
+
+class ResourceLoadSuspender {
+public:
+    ResourceLoadSuspender();
+    ~ResourceLoadSuspender();
 };
 

trunk/Source/WebCore/loader/ResourceLoader.cpp

@@ -48 +48 @@
 #include "ResourceError.h"
 #include "ResourceHandle.h"
-#include "ResourceLoadScheduler.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"
@@ -84 +83 @@
 void ResourceLoader::finishNetworkLoad()
 {
-    platformStrategies()->loaderStrategy()->resourceLoadScheduler()->remove(this);
+    platformStrategies()->loaderStrategy()->remove(this);
 
     if (m_handle) {
@@ -234 +233 @@
     }
 
-    platformStrategies()->loaderStrategy()->resourceLoadScheduler()->setDefersLoading(this, defers);
+    platformStrategies()->loaderStrategy()->setDefersLoading(this, defers);
 }
 
@@ -290 +289 @@
 {
     ASSERT(!m_documentLoader->isSubstituteLoadPending(this));
-    platformStrategies()->loaderStrategy()->resourceLoadScheduler()->remove(this);
+    platformStrategies()->loaderStrategy()->remove(this);
     if (m_handle)
         m_handle->cancel();
@@ -377 +376 @@
     bool isRedirect = !redirectResponse.isNull();
     if (isRedirect)
-        platformStrategies()->loaderStrategy()->resourceLoadScheduler()->crossOriginRedirectReceived(this, request.url());
+        platformStrategies()->loaderStrategy()->crossOriginRedirectReceived(this, request.url());
 
     m_request = request;

trunk/Source/WebCore/loader/archive/ArchiveResourceCollection.h

@@ -48 +48 @@
     void addAllResources(Archive*);
     
-    ArchiveResource* archiveResourceForURL(const URL&);
+    WEBCORE_EXPORT ArchiveResource* archiveResourceForURL(const URL&);
     PassRefPtr<Archive> popSubframeArchive(const String& frameName, const URL&);
     

trunk/Source/WebCore/loader/cache/CachedResource.cpp

@@ -45 +45 @@
 #include "PlatformStrategies.h"
 #include "ResourceHandle.h"
-#include "ResourceLoadScheduler.h"
 #include "SchemeRegistry.h"
 #include "SecurityOrigin.h"
@@ -279 +278 @@
     }
 
-    m_loader = platformStrategies()->loaderStrategy()->resourceLoadScheduler()->scheduleSubresourceLoad(cachedResourceLoader.frame(), this, request, options);
+    m_loader = platformStrategies()->loaderStrategy()->loadResource(cachedResourceLoader.frame(), this, request, options);
     if (!m_loader) {
         failBeforeStarting();

trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

@@ -62 +62 @@
 #include "RenderElement.h"
 #include "ResourceLoadInfo.h"
-#include "ResourceLoadScheduler.h"
 #include "ScriptController.h"
 #include "SecurityOrigin.h"
@@ -968 +967 @@
     checkForPendingPreloads();
 
-    platformStrategies()->loaderStrategy()->resourceLoadScheduler()->servePendingRequests();
+    platformStrategies()->loaderStrategy()->servePendingRequests();
 }
 

trunk/Source/WebCore/platform/PlatformStrategies.h

@@ -29 +29 @@
 namespace WebCore {
 
+class BlobRegistry;
 class CookiesStrategy;
 class LoaderStrategy;
@@ -64 +65 @@
     }
 
+    BlobRegistry* blobRegistry()
+    {
+        if (!m_blobRegistry)
+            m_blobRegistry = createBlobRegistry();
+        return m_blobRegistry;
+    }
+
 protected:
     PlatformStrategies()
-        : m_cookiesStrategy(nullptr)
-        , m_loaderStrategy(nullptr)
-        , m_pasteboardStrategy(nullptr)
-        , m_pluginStrategy(nullptr)
     {
     }
@@ -82 +86 @@
     virtual PasteboardStrategy* createPasteboardStrategy() = 0;
     virtual PluginStrategy* createPluginStrategy() = 0;
+    virtual BlobRegistry* createBlobRegistry() = 0;
 
-    CookiesStrategy* m_cookiesStrategy;
-    LoaderStrategy* m_loaderStrategy;
-    PasteboardStrategy* m_pasteboardStrategy;
-    PluginStrategy* m_pluginStrategy;
+    CookiesStrategy* m_cookiesStrategy { };
+    LoaderStrategy* m_loaderStrategy { };
+    PasteboardStrategy* m_pasteboardStrategy { };
+    PluginStrategy* m_pluginStrategy { };
+    BlobRegistry* m_blobRegistry { };
 };
 

trunk/Source/WebCore/platform/RuntimeApplicationChecksIOS.h

@@ -40 +40 @@
 bool applicationIsNASAHD();
 WEBCORE_EXPORT bool applicationIsTheEconomistOnIPhone();
-bool applicationIsWebProcess();
+WEBCORE_EXPORT bool applicationIsWebProcess();
 bool applicationIsIBooksOnIOS();
 

trunk/Source/WebCore/platform/network/BlobRegistry.cpp

@@ -41 +41 @@
 {
     ASSERT(isMainThread());
-
-    static BlobRegistry& instance = *platformStrategies()->loaderStrategy()->createBlobRegistry();
-    return instance;
+    return *platformStrategies()->blobRegistry();
 }
 

trunk/Source/WebCore/platform/network/ResourceRequestBase.h

@@ -245 +245 @@
     };
     
-    unsigned initializeMaximumHTTPConnectionCountPerHost();
+    WEBCORE_EXPORT unsigned initializeMaximumHTTPConnectionCountPerHost();
 #if PLATFORM(IOS)
     WEBCORE_EXPORT void initializeHTTPConnectionSettingsOnStartup();

trunk/Source/WebCore/style/StyleResolveTree.cpp

@@ -48 +48 @@
 #include "RenderTreePosition.h"
 #include "RenderWidget.h"
-#include "ResourceLoadScheduler.h"
 #include "Settings.h"
 #include "ShadowRoot.h"
@@ -945 +944 @@
 
     if (resolutionNestingDepth == 1)
-        platformStrategies()->loaderStrategy()->resourceLoadScheduler()->suspendPendingRequests();
+        platformStrategies()->loaderStrategy()->suspendPendingRequests();
 
     // FIXME: It's strange to build this into the disabler.
@@ -960 +959 @@
         queue.clear();
 
-        platformStrategies()->loaderStrategy()->resourceLoadScheduler()->resumePendingRequests();
+        platformStrategies()->loaderStrategy()->resumePendingRequests();
     }
 

trunk/Source/WebKit/CMakeLists.txt

@@ -3 +3 @@
 
 set(WebKit_SOURCES
+    WebCoreSupport/WebResourceLoadScheduler.cpp
     WebCoreSupport/WebViewGroup.cpp
 )

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2015-12-02  Antti Koivisto  <antti@apple.com>
+
+        Move ResourceLoadScheduler to WebKit1
+        https://bugs.webkit.org/show_bug.cgi?id=151743
+
+        Reviewed by Alex Christensen.
+
+        * WebCoreSupport/WebResourceLoadScheduler.cpp: Copied from Source/WebCore/loader/ResourceLoadScheduler.cpp.
+        (webResourceLoadScheduler):
+        (WebResourceLoadScheduler::hostForURL):
+        (WebResourceLoadScheduler::WebResourceLoadScheduler):
+        (WebResourceLoadScheduler::~WebResourceLoadScheduler):
+        (WebResourceLoadScheduler::scheduleSubresourceLoad):
+        (WebResourceLoadScheduler::loadResourceSynchronously):
+        (WebResourceLoadScheduler::schedulePluginStreamLoad):
+        (WebResourceLoadScheduler::scheduleLoad):
+        (WebResourceLoadScheduler::remove):
+        (WebResourceLoadScheduler::setDefersLoading):
+        (WebResourceLoadScheduler::crossOriginRedirectReceived):
+        (WebResourceLoadScheduler::servePendingRequests):
+        (WebResourceLoadScheduler::suspendPendingRequests):
+        (WebResourceLoadScheduler::resumePendingRequests):
+        (WebResourceLoadScheduler::scheduleServePendingRequests):
+        (WebResourceLoadScheduler::requestTimerFired):
+        (WebResourceLoadScheduler::HostInformation::HostInformation):
+        (WebResourceLoadScheduler::HostInformation::~HostInformation):
+        (WebResourceLoadScheduler::HostInformation::priorityToIndex):
+        (WebResourceLoadScheduler::HostInformation::schedule):
+        (WebResourceLoadScheduler::HostInformation::addLoadInProgress):
+        (WebResourceLoadScheduler::HostInformation::remove):
+        (WebResourceLoadScheduler::HostInformation::hasRequests):
+        (WebResourceLoadScheduler::HostInformation::limitRequests):
+        (WebResourceLoadScheduler::createPingHandle):
+        (WebCore::ResourceLoadScheduler::hostForURL): Deleted.
+        (WebCore::resourceLoadScheduler): Deleted.
+        (WebCore::ResourceLoadScheduler::ResourceLoadScheduler): Deleted.
+        (WebCore::ResourceLoadScheduler::~ResourceLoadScheduler): Deleted.
+        (WebCore::ResourceLoadScheduler::scheduleSubresourceLoad): Deleted.
+        (WebCore::ResourceLoadScheduler::schedulePluginStreamLoad): Deleted.
+        (WebCore::ResourceLoadScheduler::scheduleLoad): Deleted.
+        (WebCore::ResourceLoadScheduler::remove): Deleted.
+        (WebCore::ResourceLoadScheduler::setDefersLoading): Deleted.
+        (WebCore::ResourceLoadScheduler::crossOriginRedirectReceived): Deleted.
+        (WebCore::ResourceLoadScheduler::servePendingRequests): Deleted.
+        (WebCore::ResourceLoadScheduler::suspendPendingRequests): Deleted.
+        (WebCore::ResourceLoadScheduler::resumePendingRequests): Deleted.
+        (WebCore::ResourceLoadScheduler::scheduleServePendingRequests): Deleted.
+        (WebCore::ResourceLoadScheduler::requestTimerFired): Deleted.
+        (WebCore::ResourceLoadScheduler::HostInformation::HostInformation): Deleted.
+        (WebCore::ResourceLoadScheduler::HostInformation::~HostInformation): Deleted.
+        (WebCore::ResourceLoadScheduler::HostInformation::priorityToIndex): Deleted.
+        (WebCore::ResourceLoadScheduler::HostInformation::schedule): Deleted.
+        (WebCore::ResourceLoadScheduler::HostInformation::addLoadInProgress): Deleted.
+        (WebCore::ResourceLoadScheduler::HostInformation::remove): Deleted.
+        (WebCore::ResourceLoadScheduler::HostInformation::hasRequests): Deleted.
+        (WebCore::ResourceLoadScheduler::HostInformation::limitRequests): Deleted.
+        * WebCoreSupport/WebResourceLoadScheduler.h: Copied from Source/WebCore/loader/ResourceLoadScheduler.h.
+        (WebResourceLoadScheduler::isSerialLoadingEnabled):
+        (WebResourceLoadScheduler::setSerialLoadingEnabled):
+        (WebResourceLoadScheduler::HostInformation::name):
+        (WebResourceLoadScheduler::HostInformation::requestsPending):
+        (WebCore::ResourceLoadScheduler::isSerialLoadingEnabled): Deleted.
+        (WebCore::ResourceLoadScheduler::setSerialLoadingEnabled): Deleted.
+        (WebCore::ResourceLoadScheduler::Suspender::Suspender): Deleted.
+        (WebCore::ResourceLoadScheduler::Suspender::~Suspender): Deleted.
+        (WebCore::ResourceLoadScheduler::HostInformation::name): Deleted.
+        (WebCore::ResourceLoadScheduler::HostInformation::requestsPending): Deleted.
+        * WebKit.xcodeproj/project.pbxproj:
+
 2015-10-29  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.cpp

@@ -4 +4 @@
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
-    Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
+    Copyright (C) 2004-2008, 2015 Apple Inc. All rights reserved.
     Copyright (C) 2010 Google Inc. All rights reserved.
 
@@ -23 +23 @@
  */
 
-#include "config.h"
-#include "ResourceLoadScheduler.h"
-
-#include "Document.h"
-#include "DocumentLoader.h"
-#include "Frame.h"
-#include "FrameLoader.h"
-#include "LoaderStrategy.h"
-#include "Logging.h"
-#include "NetscapePlugInStreamLoader.h"
-#include "PlatformStrategies.h"
-#include "ResourceLoader.h"
-#include "ResourceRequest.h"
-#include "SubresourceLoader.h"
-#include "URL.h"
+#include "WebResourceLoadScheduler.h"
+
+#include <WebCore/Document.h>
+#include <WebCore/DocumentLoader.h>
+#include <WebCore/Frame.h>
+#include <WebCore/FrameLoader.h>
+#include <WebCore/Logging.h>
+#include <WebCore/NetscapePlugInStreamLoader.h>
+#include <WebCore/PingHandle.h>
+#include <WebCore/PlatformStrategies.h>
+#include <WebCore/ResourceHandle.h>
+#include <WebCore/ResourceRequest.h>
+#include <WebCore/SubresourceLoader.h>
+#include <WebCore/URL.h>
 #include <wtf/MainThread.h>
 #include <wtf/TemporaryChange.h>
@@ -43 +42 @@
 
 #if PLATFORM(IOS)
-#include <RuntimeApplicationChecksIOS.h>
+#include <WebCore/RuntimeApplicationChecksIOS.h>
 #endif
 
 #if USE(QUICK_LOOK)
-#include "QuickLook.h"
-#endif
-
-namespace WebCore {
+#include <WebCore/QuickLook.h>
+#endif
 
 // Match the parallel connection count used by the networking layer.
@@ -61 +58 @@
 #endif
 
-ResourceLoadScheduler::HostInformation* ResourceLoadScheduler::hostForURL(const URL& url, CreateHostPolicy createHostPolicy)
+using namespace WebCore;
+
+WebResourceLoadScheduler& webResourceLoadScheduler()
+{
+    return static_cast<WebResourceLoadScheduler&>(*platformStrategies()->loaderStrategy());
+}
+
+WebResourceLoadScheduler::HostInformation* WebResourceLoadScheduler::hostForURL(const URL& url, CreateHostPolicy createHostPolicy)
 {
     if (!url.protocolIsInHTTPFamily())
@@ -76 +80 @@
 }
 
-ResourceLoadScheduler* resourceLoadScheduler()
-{
-    ASSERT(isMainThread());
-    static ResourceLoadScheduler* globalScheduler = nullptr;
-    
-    if (!globalScheduler) {
-        static bool isCallingOutToStrategy = false;
-        
-        // If we're re-entering resourceLoadScheduler() while calling out to the LoaderStrategy,
-        // then the LoaderStrategy is trying to use the default resourceLoadScheduler.
-        // So we'll create it here and start using it.
-        if (isCallingOutToStrategy) {
-            globalScheduler = new ResourceLoadScheduler;
-            return globalScheduler;
-        }
-        
-        TemporaryChange<bool> recursionGuard(isCallingOutToStrategy, true);
-        globalScheduler = platformStrategies()->loaderStrategy()->resourceLoadScheduler();
-    }
-
-    return globalScheduler;
-}
-
-ResourceLoadScheduler::ResourceLoadScheduler()
+WebResourceLoadScheduler::WebResourceLoadScheduler()
     : m_nonHTTPProtocolHost(new HostInformation(String(), maxRequestsInFlightForNonHTTPProtocols))
-    , m_requestTimer(*this, &ResourceLoadScheduler::requestTimerFired)
+    , m_requestTimer(*this, &WebResourceLoadScheduler::requestTimerFired)
     , m_suspendPendingRequestsCount(0)
     , m_isSerialLoadingEnabled(false)
@@ -108 +89 @@
 }
 
-ResourceLoadScheduler::~ResourceLoadScheduler()
-{
-}
-
-RefPtr<SubresourceLoader> ResourceLoadScheduler::scheduleSubresourceLoad(Frame* frame, CachedResource* resource, const ResourceRequest& request, const ResourceLoaderOptions& options)
+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);
@@ -129 +110 @@
 }
 
-RefPtr<NetscapePlugInStreamLoader> ResourceLoadScheduler::schedulePluginStreamLoad(Frame* frame, NetscapePlugInStreamLoaderClient* client, const ResourceRequest& request)
+void WebResourceLoadScheduler::loadResourceSynchronously(NetworkingContext* context, unsigned long, const ResourceRequest& request, StoredCredentials storedCredentials, ClientCredentialPolicy, ResourceError& error, ResourceResponse& response, Vector<char>& data)
+{
+    ResourceHandle::loadResourceSynchronously(context, request, storedCredentials, error, response, data);
+}
+
+RefPtr<NetscapePlugInStreamLoader> WebResourceLoadScheduler::schedulePluginStreamLoad(Frame* frame, NetscapePlugInStreamLoaderClient* client, const ResourceRequest& request)
 {
     RefPtr<NetscapePlugInStreamLoader> loader = NetscapePlugInStreamLoader::create(frame, client, request);
@@ -137 +123 @@
 }
 
-void ResourceLoadScheduler::scheduleLoad(ResourceLoader* resourceLoader)
+void WebResourceLoadScheduler::scheduleLoad(ResourceLoader* resourceLoader)
 {
     ASSERT(resourceLoader);
 
-    LOG(ResourceLoading, "ResourceLoadScheduler::load resource %p '%s'", resourceLoader, resourceLoader->url().string().latin1().data());
+    LOG(ResourceLoading, "WebResourceLoadScheduler::load resource %p '%s'", resourceLoader, resourceLoader->url().string().latin1().data());
 
 #if PLATFORM(IOS)
@@ -195 +181 @@
 }
 
-void ResourceLoadScheduler::remove(ResourceLoader* resourceLoader)
+void WebResourceLoadScheduler::remove(ResourceLoader* resourceLoader)
 {
     ASSERT(resourceLoader);
@@ -214 +200 @@
 }
 
-void ResourceLoadScheduler::setDefersLoading(ResourceLoader*, bool)
-{
-}
-
-void ResourceLoadScheduler::crossOriginRedirectReceived(ResourceLoader* resourceLoader, const URL& redirectURL)
+void WebResourceLoadScheduler::setDefersLoading(ResourceLoader*, bool)
+{
+}
+
+void WebResourceLoadScheduler::crossOriginRedirectReceived(ResourceLoader* resourceLoader, const URL& redirectURL)
 {
     HostInformation* oldHost = hostForURL(resourceLoader->url());
@@ -234 +220 @@
 }
 
-void ResourceLoadScheduler::servePendingRequests(ResourceLoadPriority minimumPriority)
-{
-    LOG(ResourceLoading, "ResourceLoadScheduler::servePendingRequests. m_suspendPendingRequestsCount=%d", m_suspendPendingRequestsCount); 
+void WebResourceLoadScheduler::servePendingRequests(ResourceLoadPriority minimumPriority)
+{
+    LOG(ResourceLoading, "WebResourceLoadScheduler::servePendingRequests. m_suspendPendingRequestsCount=%d", m_suspendPendingRequestsCount); 
     if (isSuspendingPendingRequests())
         return;
@@ -255 +241 @@
 }
 
-void ResourceLoadScheduler::servePendingRequests(HostInformation* host, ResourceLoadPriority minimumPriority)
-{
-    LOG(ResourceLoading, "ResourceLoadScheduler::servePendingRequests HostInformation.m_name='%s'", host->name().latin1().data());
+void WebResourceLoadScheduler::servePendingRequests(HostInformation* host, ResourceLoadPriority minimumPriority)
+{
+    LOG(ResourceLoading, "WebResourceLoadScheduler::servePendingRequests HostInformation.m_name='%s'", host->name().latin1().data());
 
     auto priority = ResourceLoadPriority::Highest;
@@ -289 +275 @@
 }
 
-void ResourceLoadScheduler::suspendPendingRequests()
+void WebResourceLoadScheduler::suspendPendingRequests()
 {
     ++m_suspendPendingRequestsCount;
 }
 
-void ResourceLoadScheduler::resumePendingRequests()
+void WebResourceLoadScheduler::resumePendingRequests()
 {
     ASSERT(m_suspendPendingRequestsCount);
@@ -304 +290 @@
 }
     
-void ResourceLoadScheduler::scheduleServePendingRequests()
-{
-    LOG(ResourceLoading, "ResourceLoadScheduler::scheduleServePendingRequests, m_requestTimer.isActive()=%u", m_requestTimer.isActive());
+void WebResourceLoadScheduler::scheduleServePendingRequests()
+{
+    LOG(ResourceLoading, "WebResourceLoadScheduler::scheduleServePendingRequests, m_requestTimer.isActive()=%u", m_requestTimer.isActive());
     if (!m_requestTimer.isActive())
         m_requestTimer.startOneShot(0);
 }
 
-void ResourceLoadScheduler::requestTimerFired()
-{
-    LOG(ResourceLoading, "ResourceLoadScheduler::requestTimerFired\n");
+void WebResourceLoadScheduler::requestTimerFired()
+{
+    LOG(ResourceLoading, "WebResourceLoadScheduler::requestTimerFired\n");
     servePendingRequests();
 }
 
-ResourceLoadScheduler::HostInformation::HostInformation(const String& name, unsigned maxRequestsInFlight)
+WebResourceLoadScheduler::HostInformation::HostInformation(const String& name, unsigned maxRequestsInFlight)
     : m_name(name)
     , m_maxRequestsInFlight(maxRequestsInFlight)
@@ -323 +309 @@
 }
 
-ResourceLoadScheduler::HostInformation::~HostInformation()
+WebResourceLoadScheduler::HostInformation::~HostInformation()
 {
     ASSERT(!hasRequests());
 }
 
-unsigned ResourceLoadScheduler::HostInformation::priorityToIndex(ResourceLoadPriority priority)
+unsigned WebResourceLoadScheduler::HostInformation::priorityToIndex(ResourceLoadPriority priority)
 {
     switch (priority) {
@@ -346 +332 @@
 }
 
-void ResourceLoadScheduler::HostInformation::schedule(ResourceLoader* resourceLoader, ResourceLoadPriority priority)
+void WebResourceLoadScheduler::HostInformation::schedule(ResourceLoader* resourceLoader, ResourceLoadPriority priority)
 {
     m_requestsPending[priorityToIndex(priority)].append(resourceLoader);
 }
     
-void ResourceLoadScheduler::HostInformation::addLoadInProgress(ResourceLoader* resourceLoader)
+void WebResourceLoadScheduler::HostInformation::addLoadInProgress(ResourceLoader* resourceLoader)
 {
     LOG(ResourceLoading, "HostInformation '%s' loading '%s'. Current count %d", m_name.latin1().data(), resourceLoader->url().string().latin1().data(), m_requestsLoading.size());
@@ -357 +343 @@
 }
     
-void ResourceLoadScheduler::HostInformation::remove(ResourceLoader* resourceLoader)
+void WebResourceLoadScheduler::HostInformation::remove(ResourceLoader* resourceLoader)
 {
     if (m_requestsLoading.remove(resourceLoader))
@@ -372 +358 @@
 }
 
-bool ResourceLoadScheduler::HostInformation::hasRequests() const
+bool WebResourceLoadScheduler::HostInformation::hasRequests() const
 {
     if (!m_requestsLoading.isEmpty())
@@ -383 +369 @@
 }
 
-bool ResourceLoadScheduler::HostInformation::limitRequests(ResourceLoadPriority priority) const 
+bool WebResourceLoadScheduler::HostInformation::limitRequests(ResourceLoadPriority priority) const 
 {
     if (priority == ResourceLoadPriority::VeryLow && !m_requestsLoading.isEmpty())
         return true;
-    return m_requestsLoading.size() >= (resourceLoadScheduler()->isSerialLoadingEnabled() ? 1 : m_maxRequestsInFlight);
-}
-
-} // namespace WebCore
+    return m_requestsLoading.size() >= (webResourceLoadScheduler().isSerialLoadingEnabled() ? 1 : m_maxRequestsInFlight);
+}
+
+void WebResourceLoadScheduler::createPingHandle(NetworkingContext* networkingContext, ResourceRequest& request, bool shouldUseCredentialStorage)
+{
+    // PingHandle manages its own lifetime, deleting itself when its purpose has been fulfilled.
+    new PingHandle(networkingContext, request, shouldUseCredentialStorage, PingHandle::UsesAsyncCallbacks::No);
+}
+

trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.h

@@ -2 +2 @@
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
-    Copyright (C) 2004, 2006, 2007, 2008 Apple Inc. All rights reserved.
+    Copyright (C) 2004, 2006-2008, 2015 Apple Inc. All rights reserved.
     Copyright (C) 2010 Google Inc. All rights reserved.
 
@@ -21 +21 @@
  */
 
-#ifndef ResourceLoadScheduler_h
-#define ResourceLoadScheduler_h
+#ifndef WebResourceLoadScheduler_h
+#define WebResourceLoadScheduler_h
 
-#include "FrameLoaderTypes.h"
-#include "ResourceLoaderOptions.h"
-#include "ResourceLoadPriority.h"
-#include "Timer.h"
+#include <WebCore/FrameLoaderTypes.h>
+#include <WebCore/LoaderStrategy.h>
+#include <WebCore/ResourceLoadPriority.h>
+#include <WebCore/ResourceLoaderOptions.h>
+#include <WebCore/Timer.h>
 #include <array>
 #include <wtf/Deque.h>
@@ -36 +37 @@
 #include <wtf/text/WTFString.h>
 
-namespace WebCore {
+class WebResourceLoadScheduler;
 
-class CachedResource;
-class Frame;
-class URL;
-class NetscapePlugInStreamLoader;
-class NetscapePlugInStreamLoaderClient;
-class ResourceLoader;
-class ResourceRequest;
-class SubresourceLoader;
+WebResourceLoadScheduler& webResourceLoadScheduler();
 
-class ResourceLoadScheduler {
-    WTF_MAKE_NONCOPYABLE(ResourceLoadScheduler); WTF_MAKE_FAST_ALLOCATED;
+class WebResourceLoadScheduler : public WebCore::LoaderStrategy {
+    WTF_MAKE_NONCOPYABLE(WebResourceLoadScheduler); WTF_MAKE_FAST_ALLOCATED;
 public:
-    WEBCORE_EXPORT friend ResourceLoadScheduler* resourceLoadScheduler();
+    WebResourceLoadScheduler();
 
-    WEBCORE_EXPORT virtual RefPtr<SubresourceLoader> scheduleSubresourceLoad(Frame*, CachedResource*, const ResourceRequest&, const ResourceLoaderOptions&);
-    WEBCORE_EXPORT virtual RefPtr<NetscapePlugInStreamLoader> schedulePluginStreamLoad(Frame*, NetscapePlugInStreamLoaderClient*, const ResourceRequest&);
-    WEBCORE_EXPORT virtual void remove(ResourceLoader*);
-    virtual void setDefersLoading(ResourceLoader*, bool);
-    virtual void crossOriginRedirectReceived(ResourceLoader*, const URL& redirectURL);
+    RefPtr<WebCore::SubresourceLoader> loadResource(WebCore::Frame*, WebCore::CachedResource*, const WebCore::ResourceRequest&, const WebCore::ResourceLoaderOptions&) override;
+    void loadResourceSynchronously(WebCore::NetworkingContext*, unsigned long, const WebCore::ResourceRequest&, WebCore::StoredCredentials, WebCore::ClientCredentialPolicy, WebCore::ResourceError&, WebCore::ResourceResponse&, Vector<char>&) override;
+    void remove(WebCore::ResourceLoader*) override;
+    void setDefersLoading(WebCore::ResourceLoader*, bool) override;
+    void crossOriginRedirectReceived(WebCore::ResourceLoader*, const WebCore::URL& redirectURL) override;
     
-    WEBCORE_EXPORT virtual void servePendingRequests(ResourceLoadPriority minimumPriority = ResourceLoadPriority::VeryLow);
-    WEBCORE_EXPORT virtual void suspendPendingRequests();
-    WEBCORE_EXPORT virtual void resumePendingRequests();
-    
+    void servePendingRequests(WebCore::ResourceLoadPriority minimumPriority = WebCore::ResourceLoadPriority::VeryLow) override;
+    void suspendPendingRequests() override;
+    void resumePendingRequests() override;
+
+    void createPingHandle(WebCore::NetworkingContext*, WebCore::ResourceRequest&, bool shouldUseCredentialStorage) override;
+
     bool isSerialLoadingEnabled() const { return m_isSerialLoadingEnabled; }
-    virtual void setSerialLoadingEnabled(bool b) { m_isSerialLoadingEnabled = b; }
+    void setSerialLoadingEnabled(bool b) { m_isSerialLoadingEnabled = b; }
 
-    class Suspender {
-    public:
-        explicit Suspender(ResourceLoadScheduler& scheduler) : m_scheduler(scheduler) { m_scheduler.suspendPendingRequests(); }
-        ~Suspender() { m_scheduler.resumePendingRequests(); }
-    private:
-        ResourceLoadScheduler& m_scheduler;
-    };
+    RefPtr<WebCore::NetscapePlugInStreamLoader> schedulePluginStreamLoad(WebCore::Frame*, WebCore::NetscapePlugInStreamLoaderClient*, const WebCore::ResourceRequest&);
 
 protected:
-    WEBCORE_EXPORT ResourceLoadScheduler();
-    WEBCORE_EXPORT virtual ~ResourceLoadScheduler();
+    virtual ~WebResourceLoadScheduler();
 
 private:
-    void scheduleLoad(ResourceLoader*);
+    void scheduleLoad(WebCore::ResourceLoader*);
     void scheduleServePendingRequests();
     void requestTimerFired();
@@ -91 +80 @@
         
         const String& name() const { return m_name; }
-        void schedule(ResourceLoader*, ResourceLoadPriority = ResourceLoadPriority::VeryLow);
-        void addLoadInProgress(ResourceLoader*);
-        void remove(ResourceLoader*);
+        void schedule(WebCore::ResourceLoader*, WebCore::ResourceLoadPriority = WebCore::ResourceLoadPriority::VeryLow);
+        void addLoadInProgress(WebCore::ResourceLoader*);
+        void remove(WebCore::ResourceLoader*);
         bool hasRequests() const;
-        bool limitRequests(ResourceLoadPriority) const;
+        bool limitRequests(WebCore::ResourceLoadPriority) const;
 
-        typedef Deque<RefPtr<ResourceLoader>> RequestQueue;
-        RequestQueue& requestsPending(ResourceLoadPriority priority) { return m_requestsPending[priorityToIndex(priority)]; }
+        typedef Deque<RefPtr<WebCore::ResourceLoader>> RequestQueue;
+        RequestQueue& requestsPending(WebCore::ResourceLoadPriority priority) { return m_requestsPending[priorityToIndex(priority)]; }
 
     private:
-        static unsigned priorityToIndex(ResourceLoadPriority);
+        static unsigned priorityToIndex(WebCore::ResourceLoadPriority);
 
-        std::array<RequestQueue, resourceLoadPriorityCount> m_requestsPending;
-        typedef HashSet<RefPtr<ResourceLoader>> RequestMap;
+        std::array<RequestQueue, WebCore::resourceLoadPriorityCount> m_requestsPending;
+        typedef HashSet<RefPtr<WebCore::ResourceLoader>> RequestMap;
         RequestMap m_requestsLoading;
         const String m_name;
@@ -115 +104 @@
     };
     
-    HostInformation* hostForURL(const URL&, CreateHostPolicy = FindOnly);
-    WEBCORE_EXPORT void servePendingRequests(HostInformation*, ResourceLoadPriority);
+    HostInformation* hostForURL(const WebCore::URL&, CreateHostPolicy = FindOnly);
+    WEBCORE_EXPORT void servePendingRequests(HostInformation*, WebCore::ResourceLoadPriority);
 
     typedef HashMap<String, HostInformation*, StringHash> HostMap;
@@ -122 +111 @@
     HostInformation* m_nonHTTPProtocolHost;
         
-    Timer m_requestTimer;
+    WebCore::Timer m_requestTimer;
 
     unsigned m_suspendPendingRequestsCount;
@@ -128 +117 @@
 };
 
-WEBCORE_EXPORT ResourceLoadScheduler* resourceLoadScheduler();
-
-}
-
 #endif

trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj

@@ -315 +315 @@
     <ClCompile Include="..\..\cf\WebCoreSupport\WebInspectorClientCF.cpp" />
     <ClCompile Include="..\..\WebCoreSupport\WebViewGroup.cpp" />
+    <ClCompile Include="..\..\WebCoreSupport\WebResourceLoadScheduler.cpp" />
     <ClCompile Include="..\..\win\Plugins\npapi.cpp" />
     <ClCompile Include="..\..\win\Plugins\PluginDatabase.cpp" />
@@ -470 +471 @@
     <ClInclude Include="..\..\Storage\WebStorageNamespaceProvider.h" />
     <ClInclude Include="..\..\WebCoreSupport\WebViewGroup.h" />
+    <ClInclude Include="..\..\WebCoreSupport\WebResourceLoadScheduler.h" />
     <ClInclude Include="..\..\win\Plugins\PluginDatabase.h" />
     <ClInclude Include="..\..\win\Plugins\PluginDebug.h" />

trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters

@@ -339 +339 @@
       <Filter>Sources</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\WebCoreSupport\WebResourceLoadScheduler.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\win\WebCoreSupport\WebVisitedLinkStore.cpp">
       <Filter>WebCoreSupport</Filter>
@@ -667 +670 @@
     </ClInclude>
     <ClInclude Include="..\..\WebCoreSupport\WebViewGroup.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\WebCoreSupport\WebResourceLoadScheduler.h">
       <Filter>Header Files</Filter>
     </ClInclude>

trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -456 +456 @@
                 E169836211346D1B00894115 /* ProxyRuntimeObject.h in Headers */ = {isa = PBXBuildFile; fileRef = E169836111346D1B00894115 /* ProxyRuntimeObject.h */; };
                 E169836C11346D5600894115 /* ProxyRuntimeObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = E169836B11346D5600894115 /* ProxyRuntimeObject.mm */; };
+                E4AEF97B1C0DF4BC00B01727 /* WebResourceLoadScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4AEF9791C0DF4BC00B01727 /* WebResourceLoadScheduler.cpp */; };
+                E4AEF97C1C0DF4BC00B01727 /* WebResourceLoadScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = E4AEF97A1C0DF4BC00B01727 /* WebResourceLoadScheduler.h */; };
                 ED5B9524111B725A00472298 /* WebLocalizableStrings.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED5B9523111B725A00472298 /* WebLocalizableStrings.mm */; };
                 ED7F6D8B0980683500C235ED /* WebNSDataExtrasPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = ED7F6D8A0980683500C235ED /* WebNSDataExtrasPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -869 +871 @@
                 E169836111346D1B00894115 /* ProxyRuntimeObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProxyRuntimeObject.h; sourceTree = "<group>"; };
                 E169836B11346D5600894115 /* ProxyRuntimeObject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ProxyRuntimeObject.mm; sourceTree = "<group>"; };
+                E4AEF9791C0DF4BC00B01727 /* WebResourceLoadScheduler.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = WebResourceLoadScheduler.cpp; path = WebCoreSupport/WebResourceLoadScheduler.cpp; sourceTree = SOURCE_ROOT; };
+                E4AEF97A1C0DF4BC00B01727 /* WebResourceLoadScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebResourceLoadScheduler.h; path = WebCoreSupport/WebResourceLoadScheduler.h; sourceTree = SOURCE_ROOT; };
                 ED21B9810528F7AA003299AC /* WebDocumentInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebDocumentInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                 ED2B2474033A2DA800C1A526 /* WebNSPasteboardExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNSPasteboardExtras.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -1596 +1600 @@
                                 1A6A208C1886154600E50F5F /* WebProgressTrackerClient.h */,
                                 1A6A208B1886154600E50F5F /* WebProgressTrackerClient.mm */,
+                                E4AEF9791C0DF4BC00B01727 /* WebResourceLoadScheduler.cpp */,
+                                E4AEF97A1C0DF4BC00B01727 /* WebResourceLoadScheduler.h */,
                                 A5DEFC0711D5331C00885273 /* WebSecurityOrigin.mm */,
                                 A5DEFC0811D5331C00885273 /* WebSecurityOriginInternal.h */,
@@ -1889 +1895 @@
                                 9398107E0824BF01008DF038 /* WebNSURLExtras.h in Headers */,
                                 65E0F88408500917007E5CB9 /* WebNSURLRequestExtras.h in Headers */,
+                                E4AEF97C1C0DF4BC00B01727 /* WebResourceLoadScheduler.h in Headers */,
                                 65E0F9E608500F23007E5CB9 /* WebNSUserDefaultsExtras.h in Headers */,
                                 939810240824BF01008DF038 /* WebNSViewExtras.h in Headers */,
@@ -2237 +2244 @@
                                 A10C1D3718202FC50036883A /* WebGeolocationProviderIOS.mm in Sources */,
                                 939811130824BF01008DF038 /* WebHistory.mm in Sources */,
+                                E4AEF97B1C0DF4BC00B01727 /* WebResourceLoadScheduler.cpp in Sources */,
                                 939810BD0824BF01008DF038 /* WebHistoryItem.mm in Sources */,
                                 1AAF5FC00EDE3A92008D883D /* WebHostedNetscapePluginView.mm in Sources */,

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2015-12-02  Antti Koivisto  <antti@apple.com>
+
+        Move ResourceLoadScheduler to WebKit1
+        https://bugs.webkit.org/show_bug.cgi?id=151743
+
+        Reviewed by Alex Christensen.
+
+        * Plugins/Hosted/HostedNetscapePluginStream.mm:
+        (WebKit::HostedNetscapePluginStream::start):
+        (WebKit::HostedNetscapePluginStream::stop):
+        * Plugins/WebNetscapePluginStream.mm:
+        (WebNetscapePluginStream::start):
+        (WebNetscapePluginStream::stop):
+        * WebCoreSupport/WebPlatformStrategies.h:
+        * WebCoreSupport/WebPlatformStrategies.mm:
+        (WebPlatformStrategies::createLoaderStrategy):
+        (WebPlatformStrategies::createPasteboardStrategy):
+        (WebPlatformStrategies::createPluginStrategy):
+        (WebPlatformStrategies::createBlobRegistry):
+        (WebPlatformStrategies::cookiesForDOM):
+        * WebView/WebView.mm:
+        (-[WebView _dispatchPendingLoadRequests]):
+        (+[WebView _setLoadResourcesSerially:]):
+        (+[WebView _HTTPPipeliningEnabled]):
+
 2015-12-01  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.mm

@@ -37 +37 @@
 #import "WebNSURLExtras.h"
 #import "WebNSURLRequestExtras.h"
+#import "WebResourceLoadScheduler.h"
 #import <WebCore/Document.h>
 #import <WebCore/DocumentLoader.h>
 #import <WebCore/Frame.h>
 #import <WebCore/FrameLoader.h>
-#import <WebCore/ResourceLoadScheduler.h>
+#import <WebCore/PlatformStrategies.h>
 #import <WebCore/SecurityOrigin.h>
 #import <WebCore/SecurityPolicy.h>
@@ -221 +222 @@
     ASSERT(!m_frameLoader);
     ASSERT(!m_loader);
-    
-    m_loader = resourceLoadScheduler()->schedulePluginStreamLoad(core([m_instance->pluginView() webFrame]), this, m_request.get());
+
+    m_loader = webResourceLoadScheduler().schedulePluginStreamLoad(core([m_instance->pluginView() webFrame]), this, m_request.get());
 }
 

trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm

@@ -38 +38 @@
 #import "WebNetscapePluginPackage.h"
 #import "WebNetscapePluginView.h"
+#import "WebResourceLoadScheduler.h"
 #import <Foundation/NSURLResponse.h>
 #import <WebCore/Document.h>
@@ -44 +45 @@
 #import <WebCore/FrameLoader.h>
 #import <WebCore/JSDOMWindowBase.h>
-#import <WebCore/ResourceLoadScheduler.h>
+#import <WebCore/LoaderStrategy.h>
+#import <WebCore/PlatformStrategies.h>
 #import <WebCore/SecurityOrigin.h>
 #import <WebCore/SecurityPolicy.h>
@@ -286 +288 @@
     ASSERT(!m_frameLoader);
     ASSERT(!m_loader);
-    
-    m_loader = resourceLoadScheduler()->schedulePluginStreamLoad(core([m_pluginView.get() webFrame]), this, m_request.get());
+
+    m_loader = webResourceLoadScheduler().schedulePluginStreamLoad(core([m_pluginView.get() webFrame]), this, m_request.get());
 }
 

trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h

@@ -36 +36 @@
 struct PasteboardWebContent;
 
-class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::LoaderStrategy, private WebCore::PasteboardStrategy, private WebCore::PluginStrategy {
+class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::PasteboardStrategy, private WebCore::PluginStrategy {
 public:
     static void initializeIfNecessary();
@@ -48 +48 @@
     virtual WebCore::PasteboardStrategy* createPasteboardStrategy() override;
     virtual WebCore::PluginStrategy* createPluginStrategy() override;
+    virtual WebCore::BlobRegistry* createBlobRegistry() override;
 
     // WebCore::CookiesStrategy
@@ -57 +58 @@
     virtual void deleteCookie(const WebCore::NetworkStorageSession&, const WebCore::URL&, const String&) override;
 
-    // WebCore::LoaderStrategy
-    // - Using default implementation.
 
     // WebCore::PluginStrategy
@@ -68 +67 @@
     virtual void clearPluginClientPolicies() override;
 #endif
-
-    // WebCore::LoaderStrategy
-    // - Using default implementation.
 
     // WebCore::PasteboardStrategy

trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm

@@ -29 +29 @@
 #import "WebPluginDatabase.h"
 #import "WebPluginPackage.h"
+#import "WebResourceLoadScheduler.h"
+#import <WebCore/BlobRegistryImpl.h>
 #import <WebCore/BlockExceptions.h>
 #import <WebCore/Color.h>
@@ -63 +65 @@
 LoaderStrategy* WebPlatformStrategies::createLoaderStrategy()
 {
+    return new WebResourceLoadScheduler;
+}
+
+PasteboardStrategy* WebPlatformStrategies::createPasteboardStrategy()
+{
     return this;
 }
 
-PasteboardStrategy* WebPlatformStrategies::createPasteboardStrategy()
+PluginStrategy* WebPlatformStrategies::createPluginStrategy()
 {
     return this;
 }
 
-PluginStrategy* WebPlatformStrategies::createPluginStrategy()
-{
-    return this;
+BlobRegistry* WebPlatformStrategies::createBlobRegistry()
+{
+    return new WebCore::BlobRegistryImpl;
 }
 

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -96 +96 @@
 #import "WebPreferencesPrivate.h"
 #import "WebProgressTrackerClient.h"
+#import "WebResourceLoadScheduler.h"
 #import "WebScriptDebugDelegate.h"
 #import "WebScriptWorldInternal.h"
@@ -168 +169 @@
 #import <WebCore/RenderWidget.h>
 #import <WebCore/ResourceHandle.h>
-#import <WebCore/ResourceLoadScheduler.h>
 #import <WebCore/ResourceRequest.h>
 #import <WebCore/RuntimeApplicationChecks.h>
@@ -762 +762 @@
 - (void)_dispatchPendingLoadRequests
 {
-    resourceLoadScheduler()->servePendingRequests();
+    webResourceLoadScheduler().servePendingRequests();
 }
 
@@ -1617 +1617 @@
 {
     if (suspend)
-        resourceLoadScheduler()->suspendPendingRequests();
+        webResourceLoadScheduler().suspendPendingRequests();
     else
-        resourceLoadScheduler()->resumePendingRequests();
+        webResourceLoadScheduler().resumePendingRequests();
 }
 
@@ -4483 +4483 @@
 {
     WebPlatformStrategies::initializeIfNecessary();
-    resourceLoadScheduler()->setSerialLoadingEnabled(serialize);
+
+    webResourceLoadScheduler().setSerialLoadingEnabled(serialize);
 }
 

trunk/Source/WebKit/win/Plugins/PluginStream.cpp

@@ -33 +33 @@
 #include "HTTPHeaderNames.h"
 #include "PluginDebug.h"
-#include "ResourceLoadScheduler.h"
 #include "SharedBuffer.h"
 #include "SubresourceLoader.h"
+#include "WebResourceLoadScheduler.h"
 #include <wtf/StringExtras.h>
 #include <wtf/text/CString.h>
@@ -97 +97 @@
 {
     ASSERT(!m_loadManually);
-    m_loader = resourceLoadScheduler()->schedulePluginStreamLoad(m_frame, this, m_resourceRequest);
+    m_loader = webResourceLoadScheduler().schedulePluginStreamLoad(m_frame, this, m_resourceRequest);
 }
 

trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp

@@ -29 +29 @@
 #include "PluginDatabase.h"
 #include "WebFrameNetworkingContext.h"
+#include "WebResourceLoadScheduler.h"
+#include <WebCore/BlobRegistryImpl.h>
 #include <WebCore/Page.h>
 #include <WebCore/PageGroup.h>
@@ -55 +57 @@
 LoaderStrategy* WebPlatformStrategies::createLoaderStrategy()
 {
-    return this;
+    return new WebResourceLoadScheduler;
 }
 
@@ -66 +68 @@
 {
     return this;
+}
+
+BlobRegistry* WebPlatformStrategies::createBlobRegistry()
+{
+    return new BlobRegistryImpl;
 }
 

trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h

@@ -32 +32 @@
 #include <WebCore/PluginStrategy.h>
 
-class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::LoaderStrategy, private WebCore::PluginStrategy {
+class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::PluginStrategy {
 public:
     static void initialize();
@@ -44 +44 @@
     virtual WebCore::PasteboardStrategy* createPasteboardStrategy();
     virtual WebCore::PluginStrategy* createPluginStrategy();
+    virtual WebCore::BlobRegistry* createBlobRegistry();
 
     // WebCore::CookiesStrategy

trunk/Source/WebKit/win/WebView.cpp

@@ -35 +35 @@
 #include "PluginDatabase.h"
 #include "PluginView.h"
-#include "ResourceLoadScheduler.h"
 #include "SoftLinking.h"
 #include "SubframeLoader.h"
@@ -68 +67 @@
 #include "WebPlatformStrategies.h"
 #include "WebPreferences.h"
+#include "WebResourceLoadScheduler.h"
 #include "WebScriptWorld.h"
 #include "WebStorageNamespaceProvider.h"
@@ -7488 +7488 @@
 {
     WebPlatformStrategies::initialize();
-    resourceLoadScheduler()->setSerialLoadingEnabled(serialize);
+    webResourceLoadScheduler().setSerialLoadingEnabled(serialize);
     return S_OK;
 }
@@ -7504 +7504 @@
 HRESULT WebView::dispatchPendingLoadRequests()
 {
-    resourceLoadScheduler()->servePendingRequests();
+    webResourceLoadScheduler().servePendingRequests();
     return S_OK;
 }

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-12-02  Antti Koivisto  <antti@apple.com>
+
+        Move ResourceLoadScheduler to WebKit1
+        https://bugs.webkit.org/show_bug.cgi?id=151743
+
+        Reviewed by Alex Christensen.
+
+        * NetworkProcess/NetworkProcessPlatformStrategies.cpp:
+        (WebKit::NetworkProcessPlatformStrategies::createCookiesStrategy):
+        (WebKit::NetworkProcessPlatformStrategies::createLoaderStrategy):
+        (WebKit::NetworkProcessPlatformStrategies::createPasteboardStrategy):
+        (WebKit::NetworkProcessPlatformStrategies::createPluginStrategy):
+        (WebKit::NetworkProcessPlatformStrategies::createBlobRegistry):
+        (WebKit::NetworkProcessPlatformStrategies::resourceLoadScheduler): Deleted.
+        (WebKit::NetworkProcessPlatformStrategies::loadResourceSynchronously): Deleted.
+        * NetworkProcess/NetworkProcessPlatformStrategies.h:
+        * WebProcess/InjectedBundle/InjectedBundle.cpp:
+        * WebProcess/Network/WebResourceLoadScheduler.cpp:
+        (WebKit::WebResourceLoadScheduler::~WebResourceLoadScheduler):
+        (WebKit::WebResourceLoadScheduler::loadResource):
+        (WebKit::WebResourceLoadScheduler::resumePendingRequests):
+        (WebKit::WebResourceLoadScheduler::networkProcessCrashed):
+        (WebKit::WebResourceLoadScheduler::loadResourceSynchronously):
+        (WebKit::WebResourceLoadScheduler::createPingHandle):
+        (WebKit::WebResourceLoadScheduler::scheduleSubresourceLoad): Deleted.
+        (WebKit::WebResourceLoadScheduler::setSerialLoadingEnabled): Deleted.
+        * WebProcess/Network/WebResourceLoadScheduler.h:
+        (WebKit::WebResourceLoadScheduler::webResourceLoaderForIdentifier):
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::Stream::start):
+        (WebKit::PluginView::Stream::cancel):
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+        (WebKit::WebPlatformStrategies::createLoaderStrategy):
+        (WebKit::WebPlatformStrategies::createPasteboardStrategy):
+        (WebKit::WebPlatformStrategies::createPluginStrategy):
+        (WebKit::WebPlatformStrategies::createBlobRegistry):
+        (WebKit::WebPlatformStrategies::cookiesForDOM):
+        (WebKit::WebPlatformStrategies::deleteCookie):
+        (WebKit::WebPlatformStrategies::refreshPlugins):
+        (WebKit::WebPlatformStrategies::resourceLoadScheduler): Deleted.
+        (WebKit::WebPlatformStrategies::loadResourceSynchronously): Deleted.
+        (WebKit::WebPlatformStrategies::createPingHandle): Deleted.
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+
 2015-12-02  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.cpp

@@ -42 +42 @@
 CookiesStrategy* NetworkProcessPlatformStrategies::createCookiesStrategy()
 {
-    return 0;
+    return nullptr;
 }
 
 LoaderStrategy* NetworkProcessPlatformStrategies::createLoaderStrategy()
 {
-    return this;
+    return nullptr;
 }
 
 PasteboardStrategy* NetworkProcessPlatformStrategies::createPasteboardStrategy()
 {
-    return 0;
+    return nullptr;
 }
 
 PluginStrategy* NetworkProcessPlatformStrategies::createPluginStrategy()
 {
-    return 0;
-}
-
-ResourceLoadScheduler* NetworkProcessPlatformStrategies::resourceLoadScheduler()
-{
-    ASSERT_NOT_REACHED();
-    return 0;
-}
-
-void NetworkProcessPlatformStrategies::loadResourceSynchronously(NetworkingContext*, unsigned long, const ResourceRequest&, StoredCredentials, ClientCredentialPolicy, ResourceError&, ResourceResponse&, Vector<char>&)
-{
-    ASSERT_NOT_REACHED();
+    return nullptr;
 }
 

trunk/Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.h

@@ -32 +32 @@
 namespace WebKit {
 
-class NetworkProcessPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::LoaderStrategy {
+class NetworkProcessPlatformStrategies : public WebCore::PlatformStrategies {
 public:
     static void initialize();
@@ -38 +38 @@
 private:
     // WebCore::PlatformStrategies
-    virtual WebCore::CookiesStrategy* createCookiesStrategy() override;
-    virtual WebCore::LoaderStrategy* createLoaderStrategy() override;
-    virtual WebCore::PasteboardStrategy* createPasteboardStrategy() override;
-    virtual WebCore::PluginStrategy* createPluginStrategy() override;
-
-    // WebCore::LoaderStrategy
-    virtual WebCore::ResourceLoadScheduler* resourceLoadScheduler() 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 WebCore::BlobRegistry* createBlobRegistry() override;
+    WebCore::CookiesStrategy* createCookiesStrategy() override;
+    WebCore::LoaderStrategy* createLoaderStrategy() override;
+    WebCore::PasteboardStrategy* createPasteboardStrategy() override;
+    WebCore::PluginStrategy* createPluginStrategy() override;
+    WebCore::BlobRegistry* createBlobRegistry() override;
 };
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp

@@ -67 +67 @@
 #include <WebCore/PrintContext.h>
 #include <WebCore/ResourceHandle.h>
-#include <WebCore/ResourceLoadScheduler.h>
 #include <WebCore/ScriptController.h>
 #include <WebCore/SecurityOrigin.h>

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

@@ -27 +27 @@
 #include "WebResourceLoadScheduler.h"
 
+#include "HangDetectionDisabler.h"
 #include "Logging.h"
 #include "NetworkConnectionToWebProcessMessages.h"
@@ -36 +37 @@
 #include "WebFrame.h"
 #include "WebFrameLoaderClient.h"
+#include "WebFrameNetworkingContext.h"
 #include "WebPage.h"
 #include "WebProcess.h"
@@ -46 +48 @@
 #include <WebCore/FrameLoader.h>
 #include <WebCore/NetscapePlugInStreamLoader.h>
+#include <WebCore/PlatformStrategies.h>
 #include <WebCore/ReferrerPolicy.h>
 #include <WebCore/ResourceLoader.h>
@@ -66 +69 @@
 }
 
-RefPtr<SubresourceLoader> WebResourceLoadScheduler::scheduleSubresourceLoad(Frame* frame, CachedResource* resource, const ResourceRequest& request, const ResourceLoaderOptions& options)
+RefPtr<SubresourceLoader> WebResourceLoadScheduler::loadResource(Frame* frame, CachedResource* resource, const ResourceRequest& request, const ResourceLoaderOptions& options)
 {
     RefPtr<SubresourceLoader> loader = SubresourceLoader::create(frame, resource, request, options);
@@ -270 +273 @@
 }
 
-void WebResourceLoadScheduler::setSerialLoadingEnabled(bool)
-{
-    // Network process does not reorder loads.
-}
-
 void WebResourceLoadScheduler::networkProcessCrashed()
 {
@@ -284 +282 @@
 }
 
+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

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

@@ -28 +28 @@
 
 #include "WebResourceLoader.h"
-#include <WebCore/ResourceLoadPriority.h>
-#include <WebCore/ResourceLoadScheduler.h>
+#include <WebCore/LoaderStrategy.h>
 #include <WebCore/ResourceLoader.h>
+#include <wtf/HashSet.h>
 #include <wtf/RunLoop.h>
 
@@ -36 +36 @@
 
 class NetworkProcessConnection;
+class WebResourceLoadScheduler;
 typedef uint64_t ResourceLoadIdentifier;
 
-class WebResourceLoadScheduler : public WebCore::ResourceLoadScheduler {
+class WebResourceLoadScheduler : public WebCore::LoaderStrategy {
     WTF_MAKE_NONCOPYABLE(WebResourceLoadScheduler); WTF_MAKE_FAST_ALLOCATED;
 public:
@@ -44 +45 @@
     virtual ~WebResourceLoadScheduler();
     
-    virtual RefPtr<WebCore::SubresourceLoader> scheduleSubresourceLoad(WebCore::Frame*, WebCore::CachedResource*, const WebCore::ResourceRequest&, const WebCore::ResourceLoaderOptions&) override;
-    virtual RefPtr<WebCore::NetscapePlugInStreamLoader> schedulePluginStreamLoad(WebCore::Frame*, WebCore::NetscapePlugInStreamLoaderClient*, const WebCore::ResourceRequest&) override;
-    
+    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;
@@ -56 +57 @@
     virtual void resumePendingRequests() override;
 
-    virtual void setSerialLoadingEnabled(bool) 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();

trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -35 +35 @@
 #include "WebPageProxyMessages.h"
 #include "WebProcess.h"
+#include "WebResourceLoadScheduler.h"
 #include <WebCore/BitmapImage.h>
 #include <WebCore/Chrome.h>
@@ -63 +64 @@
 #include <WebCore/ProxyServer.h>
 #include <WebCore/RenderEmbeddedObject.h>
-#include <WebCore/ResourceLoadScheduler.h>
 #include <WebCore/ScriptController.h>
 #include <WebCore/ScrollView.h>
@@ -161 +161 @@
     ASSERT(frame);
 
-    m_loader = resourceLoadScheduler()->schedulePluginStreamLoad(frame, this, m_request);
+    m_loader = WebProcess::singleton().webResourceLoadScheduler().schedulePluginStreamLoad(frame, this, m_request);
 }
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp

@@ -41 +41 @@
 #include "WebFrame.h"
 #include "WebFrameLoaderClient.h"
-#include "WebFrameNetworkingContext.h"
 #include "WebIDBFactoryBackend.h"
 #include "WebPage.h"
@@ -93 +92 @@
 LoaderStrategy* WebPlatformStrategies::createLoaderStrategy()
 {
+    return &WebProcess::singleton().webResourceLoadScheduler();
+}
+
+PasteboardStrategy* WebPlatformStrategies::createPasteboardStrategy()
+{
     return this;
 }
 
-PasteboardStrategy* WebPlatformStrategies::createPasteboardStrategy()
+PluginStrategy* WebPlatformStrategies::createPluginStrategy()
 {
     return this;
 }
 
-PluginStrategy* WebPlatformStrategies::createPluginStrategy()
-{
-    return this;
+BlobRegistry* WebPlatformStrategies::createBlobRegistry()
+{
+    return new BlobRegistryProxy;
 }
 
@@ -147 +151 @@
 {
     WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::DeleteCookie(SessionTracker::sessionID(session), url, cookieName), 0);
-}
-
-// LoaderStrategy
-
-ResourceLoadScheduler* WebPlatformStrategies::resourceLoadScheduler()
-{
-    return &WebProcess::singleton().webResourceLoadScheduler();
-}
-
-void WebPlatformStrategies::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 WebPlatformStrategies::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);
-}
-
-BlobRegistry* WebPlatformStrategies::createBlobRegistry()
-{
-    return new BlobRegistryProxy;
 }
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h

@@ -37 +37 @@
 namespace WebKit {
 
-class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::LoaderStrategy, private WebCore::PasteboardStrategy, private WebCore::PluginStrategy {
+class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::PasteboardStrategy, private WebCore::PluginStrategy {
     friend class NeverDestroyed<WebPlatformStrategies>;
 public:
@@ -50 +50 @@
     virtual WebCore::PasteboardStrategy* createPasteboardStrategy() override;
     virtual WebCore::PluginStrategy* createPluginStrategy() override;
+    virtual WebCore::BlobRegistry* createBlobRegistry() override;
 
     // WebCore::CookiesStrategy
@@ -58 +59 @@
     virtual bool getRawCookies(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, Vector<WebCore::Cookie>&) override;
     virtual void deleteCookie(const WebCore::NetworkStorageSession&, const WebCore::URL&, const String&) override;
-
-    // WebCore::LoaderStrategy
-    virtual WebCore::ResourceLoadScheduler* resourceLoadScheduler() 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 WebCore::BlobRegistry* createBlobRegistry() override;
-    virtual void createPingHandle(WebCore::NetworkingContext*, WebCore::ResourceRequest&, bool shouldUseCredentialStorage) override;
 
     // WebCore::PluginStrategy