Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (183736 => 183737)
--- trunk/Source/WebKit2/CMakeLists.txt 2015-05-04 05:16:00 UTC (rev 183736)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-05-04 07:52:00 UTC (rev 183737)
@@ -158,7 +158,6 @@
NetworkProcess/NetworkConnectionToWebProcess.cpp
NetworkProcess/NetworkProcess.cpp
NetworkProcess/NetworkProcessPlatformStrategies.cpp
- NetworkProcess/NetworkResourceLoadScheduler.cpp
NetworkProcess/NetworkResourceLoader.cpp
NetworkProcess/FileAPI/NetworkBlobRegistry.cpp
Modified: trunk/Source/WebKit2/ChangeLog (183736 => 183737)
--- trunk/Source/WebKit2/ChangeLog 2015-05-04 05:16:00 UTC (rev 183736)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-04 07:52:00 UTC (rev 183737)
@@ -1,3 +1,35 @@
+2015-05-04 Antti Koivisto <[email protected]>
+
+ Remove NetworkResourceLoadScheduler
+ https://bugs.webkit.org/show_bug.cgi?id=144550
+
+ Reviewed by Sam Weinig.
+
+ It doesn't really do anything.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::scheduleResourceLoad):
+ (WebKit::NetworkConnectionToWebProcess::performSynchronousLoad):
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::getNetworkProcessStatistics):
+ * NetworkProcess/NetworkProcess.h:
+ (WebKit::NetworkProcess::networkResourceLoadScheduler): Deleted.
+ * NetworkProcess/NetworkResourceLoadScheduler.cpp: Removed.
+ * NetworkProcess/NetworkResourceLoadScheduler.h: Removed.
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::cleanup):
+ * NetworkProcess/NetworkResourceLoader.h:
+ (WebKit::NetworkResourceLoader::create):
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::initializeNetworkSettings):
+
+ Moved from NetworkResourceLoadSchedulerMac.mm.
+
+ (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+ * NetworkProcess/mac/NetworkResourceLoadSchedulerMac.mm: Removed.
+ * NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp: Removed.
+ * WebKit2.xcodeproj/project.pbxproj:
+
2015-05-03 Alexey Proskuryakov <[email protected]>
Crash in SandboxExtension::consume when uploading iWork -tef documents to iCloud
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (183736 => 183737)
--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2015-05-04 05:16:00 UTC (rev 183736)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2015-05-04 07:52:00 UTC (rev 183737)
@@ -115,16 +115,16 @@
void NetworkConnectionToWebProcess::scheduleResourceLoad(const NetworkResourceLoadParameters& loadParameters)
{
- RefPtr<NetworkResourceLoader> loader = NetworkResourceLoader::create(loadParameters, this);
- m_networkResourceLoaders.add(loadParameters.identifier, loader);
- NetworkProcess::singleton().networkResourceLoadScheduler().scheduleLoader(loader.get());
+ auto loader = NetworkResourceLoader::create(loadParameters, this);
+ m_networkResourceLoaders.add(loadParameters.identifier, loader.ptr());
+ loader->start();
}
void NetworkConnectionToWebProcess::performSynchronousLoad(const NetworkResourceLoadParameters& loadParameters, PassRefPtr<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply> reply)
{
- RefPtr<NetworkResourceLoader> loader = NetworkResourceLoader::create(loadParameters, this, reply);
- m_networkResourceLoaders.add(loadParameters.identifier, loader);
- NetworkProcess::singleton().networkResourceLoadScheduler().scheduleLoader(loader.get());
+ auto loader = NetworkResourceLoader::create(loadParameters, this, reply);
+ m_networkResourceLoaders.add(loadParameters.identifier, loader.ptr());
+ loader->start();
}
void NetworkConnectionToWebProcess::removeLoadIdentifier(ResourceLoadIdentifier identifier)
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (183736 => 183737)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-05-04 05:16:00 UTC (rev 183736)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-05-04 07:52:00 UTC (rev 183737)
@@ -475,12 +475,9 @@
void NetworkProcess::getNetworkProcessStatistics(uint64_t callbackID)
{
- NetworkResourceLoadScheduler& scheduler = NetworkProcess::singleton().networkResourceLoadScheduler();
-
StatisticsData data;
auto& networkProcess = NetworkProcess::singleton();
- data.statisticsNumbers.set("LoadsActiveCount", scheduler.loadsActiveCount());
data.statisticsNumbers.set("DownloadsActiveCount", networkProcess.downloadManager().activeDownloadCount());
data.statisticsNumbers.set("OutstandingAuthenticationChallengesCount", networkProcess.authenticationManager().outstandingAuthenticationChallengeCount());
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (183736 => 183737)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-05-04 05:16:00 UTC (rev 183736)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-05-04 07:52:00 UTC (rev 183737)
@@ -32,7 +32,6 @@
#include "ChildProcess.h"
#include "DownloadManager.h"
#include "MessageReceiverMap.h"
-#include "NetworkResourceLoadScheduler.h"
#include <WebCore/DiagnosticLoggingClient.h>
#include <WebCore/SessionID.h>
#include <memory>
@@ -75,8 +74,6 @@
void removeNetworkConnectionToWebProcess(NetworkConnectionToWebProcess*);
- NetworkResourceLoadScheduler& networkResourceLoadScheduler() { return m_networkResourceLoadScheduler; }
-
AuthenticationManager& authenticationManager();
DownloadManager& downloadManager();
bool canHandleHTTPSServerTrustEvaluation() const { return m_canHandleHTTPSServerTrustEvaluation; }
@@ -157,8 +154,6 @@
// Connections to WebProcesses.
Vector<RefPtr<NetworkConnectionToWebProcess>> m_webProcessConnections;
- NetworkResourceLoadScheduler m_networkResourceLoadScheduler;
-
String m_diskCacheDirectory;
bool m_hasSetCacheModel;
CacheModel m_cacheModel;
Deleted: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.cpp (183736 => 183737)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.cpp 2015-05-04 05:16:00 UTC (rev 183736)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.cpp 2015-05-04 07:52:00 UTC (rev 183737)
@@ -1,55 +0,0 @@
-#include "config.h"
-#include "NetworkResourceLoadScheduler.h"
-
-#include "Logging.h"
-#include "NetworkConnectionToWebProcess.h"
-#include "NetworkProcess.h"
-#include "NetworkResourceLoadParameters.h"
-#include "NetworkResourceLoader.h"
-#include <wtf/MainThread.h>
-#include <wtf/text/CString.h>
-
-#if ENABLE(NETWORK_PROCESS)
-
-using namespace WebCore;
-
-namespace WebKit {
-
-NetworkResourceLoadScheduler::NetworkResourceLoadScheduler()
-{
- platformInitializeNetworkSettings();
-}
-
-void NetworkResourceLoadScheduler::scheduleLoader(PassRefPtr<NetworkResourceLoader> loader)
-{
- ASSERT(RunLoop::isMain());
-
- LOG(NetworkScheduling, "(NetworkProcess) NetworkResourceLoadScheduler::scheduleLoader resource '%s'", loader->originalRequest().url().string().utf8().data());
-
- // This request might be from WebProcess we've lost our connection to.
- // If so we should just skip it.
- if (!loader->connectionToWebProcess())
- return;
-
- m_activeLoaders.add(loader.get());
-
- loader->start();
-}
-
-void NetworkResourceLoadScheduler::removeLoader(NetworkResourceLoader* loader)
-{
- ASSERT(RunLoop::isMain());
-
- LOG(NetworkScheduling, "(NetworkProcess) NetworkResourceLoadScheduler::removeLoader resource '%s'", loader->originalRequest().url().string().utf8().data());
-
- m_activeLoaders.remove(loader);
-}
-
-uint64_t NetworkResourceLoadScheduler::loadsActiveCount() const
-{
- return m_activeLoaders.size();
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(NETWORK_PROCESS)
Deleted: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.h (183736 => 183737)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.h 2015-05-04 05:16:00 UTC (rev 183736)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.h 2015-05-04 07:52:00 UTC (rev 183737)
@@ -1,61 +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 NetworkResourceLoadScheduler_h
-#define NetworkResourceLoadScheduler_h
-
-#include <WebCore/Timer.h>
-#include <wtf/HashSet.h>
-#include <wtf/text/StringHash.h>
-
-#if ENABLE(NETWORK_PROCESS)
-
-namespace WebKit {
-
-class NetworkResourceLoader;
-
-class NetworkResourceLoadScheduler {
- WTF_MAKE_NONCOPYABLE(NetworkResourceLoadScheduler); WTF_MAKE_FAST_ALLOCATED;
-
-public:
- NetworkResourceLoadScheduler();
-
- void scheduleLoader(PassRefPtr<NetworkResourceLoader>);
- void removeLoader(NetworkResourceLoader*);
-
- // For NetworkProcess statistics reporting.
- uint64_t loadsActiveCount() const;
-
-private:
- static void platformInitializeNetworkSettings();
-
- HashSet<RefPtr<NetworkResourceLoader>> m_activeLoaders;
-};
-
-} // namespace WebKit
-
-#endif // ENABLE(NETWORK_PROCESS)
-
-#endif // NetworkResourceLoadScheduler_h
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (183736 => 183737)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-05-04 05:16:00 UTC (rev 183736)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-05-04 07:52:00 UTC (rev 183737)
@@ -204,8 +204,6 @@
invalidateSandboxExtensions();
- NetworkProcess::singleton().networkResourceLoadScheduler().removeLoader(this);
-
m_handle = nullptr;
// This will cause NetworkResourceLoader to be destroyed and therefore we do it last.
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (183736 => 183737)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2015-05-04 05:16:00 UTC (rev 183736)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2015-05-04 07:52:00 UTC (rev 183737)
@@ -61,14 +61,14 @@
class NetworkResourceLoader : public RefCounted<NetworkResourceLoader>, public WebCore::ResourceHandleClient, public IPC::MessageSender {
public:
- static RefPtr<NetworkResourceLoader> create(const NetworkResourceLoadParameters& parameters, NetworkConnectionToWebProcess* connection)
+ static Ref<NetworkResourceLoader> create(const NetworkResourceLoadParameters& parameters, NetworkConnectionToWebProcess* connection)
{
- return adoptRef(new NetworkResourceLoader(parameters, connection, nullptr));
+ return adoptRef(*new NetworkResourceLoader(parameters, connection, nullptr));
}
- static RefPtr<NetworkResourceLoader> create(const NetworkResourceLoadParameters& parameters, NetworkConnectionToWebProcess* connection, PassRefPtr<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply> reply)
+ static Ref<NetworkResourceLoader> create(const NetworkResourceLoadParameters& parameters, NetworkConnectionToWebProcess* connection, PassRefPtr<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply> reply)
{
- return adoptRef(new NetworkResourceLoader(parameters, connection, reply));
+ return adoptRef(*new NetworkResourceLoader(parameters, connection, reply));
}
~NetworkResourceLoader();
Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (183736 => 183737)
--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-05-04 05:16:00 UTC (rev 183736)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-05-04 07:52:00 UTC (rev 183737)
@@ -33,6 +33,8 @@
#import "NetworkResourceLoader.h"
#import "SandboxExtension.h"
#import <WebCore/CFNetworkSPI.h>
+#import <WebCore/ResourceRequestCFNet.h>
+#import <WebKitSystemInterface.h>
#import <wtf/RAMSize.h>
namespace WebKit {
@@ -43,6 +45,23 @@
_CFURLCachePurgeMemoryCache(adoptCF(CFURLCacheCopySharedURLCache()).get());
}
+static void initializeNetworkSettings()
+{
+ static const unsigned preferredConnectionCount = 6;
+
+ WKInitializeMaximumHTTPConnectionCountPerHost(preferredConnectionCount);
+
+ Boolean keyExistsAndHasValidFormat = false;
+ Boolean prefValue = CFPreferencesGetAppBooleanValue(CFSTR("WebKitEnableHTTPPipelining"), kCFPreferencesCurrentApplication, &keyExistsAndHasValidFormat);
+ if (keyExistsAndHasValidFormat)
+ WebCore::ResourceRequest::setHTTPPipeliningEnabled(prefValue);
+
+ if (WebCore::ResourceRequest::resourcePrioritiesEnabled()) {
+ WKSetHTTPRequestMaximumPriority(toPlatformRequestPriority(WebCore::ResourceLoadPriority::Highest));
+ WKSetHTTPRequestMinimumFastLanePriority(toPlatformRequestPriority(WebCore::ResourceLoadPriority::Medium));
+ }
+}
+
void NetworkProcess::platformInitializeNetworkProcessCocoa(const NetworkProcessCreationParameters& parameters)
{
#if PLATFORM(IOS)
@@ -56,6 +75,8 @@
_CFNetworkSetATSContext(parameters.networkATSContext.get());
#endif
+ initializeNetworkSettings();
+
// FIXME: Most of what this function does for cache size gets immediately overridden by setCacheModel().
// - memory cache size passed from UI process is always ignored;
// - disk cache size passed from UI process is effectively a minimum size.
Deleted: trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoadSchedulerMac.mm (183736 => 183737)
--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoadSchedulerMac.mm 2015-05-04 05:16:00 UTC (rev 183736)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoadSchedulerMac.mm 2015-05-04 07:52:00 UTC (rev 183737)
@@ -1,59 +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.
- */
-
-#import "config.h"
-#import "NetworkResourceLoadScheduler.h"
-
-#import <WebCore/ResourceRequest.h>
-#import <WebCore/ResourceRequestCFNet.h>
-#import <WebCore/WebCoreSystemInterface.h>
-#import <WebKitSystemInterface.h>
-
-#if ENABLE(NETWORK_PROCESS)
-
-using namespace WebCore;
-
-namespace WebKit {
-
-void NetworkResourceLoadScheduler::platformInitializeNetworkSettings()
-{
- static const unsigned preferredConnectionCount = 6;
-
- WKInitializeMaximumHTTPConnectionCountPerHost(preferredConnectionCount);
-
- Boolean keyExistsAndHasValidFormat = false;
- Boolean prefValue = CFPreferencesGetAppBooleanValue(CFSTR("WebKitEnableHTTPPipelining"), kCFPreferencesCurrentApplication, &keyExistsAndHasValidFormat);
- if (keyExistsAndHasValidFormat)
- ResourceRequest::setHTTPPipeliningEnabled(prefValue);
-
- if (ResourceRequest::resourcePrioritiesEnabled()) {
- WKSetHTTPRequestMaximumPriority(toPlatformRequestPriority(ResourceLoadPriority::Highest));
- WKSetHTTPRequestMinimumFastLanePriority(toPlatformRequestPriority(ResourceLoadPriority::Medium));
- }
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(NETWORK_PROCESS)
Deleted: trunk/Source/WebKit2/NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp (183736 => 183737)
--- trunk/Source/WebKit2/NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp 2015-05-04 05:16:00 UTC (rev 183736)
+++ trunk/Source/WebKit2/NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp 2015-05-04 07:52:00 UTC (rev 183737)
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- * Copyright (C) 2013 Company 100 Inc.
- *
- * 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"
-#if ENABLE(NETWORK_PROCESS)
-
-#include "NetworkResourceLoadScheduler.h"
-
-namespace WebKit {
-
-void NetworkResourceLoadScheduler::platformInitializeNetworkSettings()
-{
-}
-
-} // namespace WebKit
-
-#endif
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (183736 => 183737)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2015-05-04 05:16:00 UTC (rev 183736)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2015-05-04 07:52:00 UTC (rev 183737)
@@ -2,7 +2,6 @@
NetworkProcess/efl/NetworkProcessMainEfl.cpp
NetworkProcess/soup/NetworkProcessSoup.cpp
- NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp
NetworkProcess/soup/RemoteNetworkingContextSoup.cpp
Platform/IPC/unix/AttachmentUnix.cpp
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (183736 => 183737)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2015-05-04 05:16:00 UTC (rev 183736)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2015-05-04 07:52:00 UTC (rev 183737)
@@ -30,7 +30,6 @@
NetworkProcess/gtk/NetworkProcessMainGtk.cpp
NetworkProcess/soup/NetworkProcessSoup.cpp
- NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp
NetworkProcess/soup/RemoteNetworkingContextSoup.cpp
Platform/IPC/unix/AttachmentUnix.cpp
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (183736 => 183737)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-04 05:16:00 UTC (rev 183736)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-04 07:52:00 UTC (rev 183737)
@@ -894,7 +894,6 @@
512A9761180E031D0039A149 /* DatabaseProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 512A975F180E03160039A149 /* DatabaseProcessMessages.h */; };
512A9769180E09B80039A149 /* DatabaseProcessProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512A9767180E09B80039A149 /* DatabaseProcessProxyMessageReceiver.cpp */; };
512A976A180E09B80039A149 /* DatabaseProcessProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 512A9768180E09B80039A149 /* DatabaseProcessProxyMessages.h */; };
- 512C069016390E6900ABB911 /* NetworkResourceLoadSchedulerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 512C068F16390E6900ABB911 /* NetworkResourceLoadSchedulerMac.mm */; };
512E34E4130B4D0500ABD19A /* WKApplicationCacheManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517A33B3130B308C00F80CB5 /* WKApplicationCacheManager.cpp */; };
512E34E5130B4D0500ABD19A /* WKApplicationCacheManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 517A33B4130B308C00F80CB5 /* WKApplicationCacheManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
512E3524130B550600ABD19A /* WebApplicationCacheManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512E3520130B550100ABD19A /* WebApplicationCacheManagerProxy.cpp */; };
@@ -970,8 +969,6 @@
517DD5C5180DC3E10081660B /* DatabaseProcessProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 517DD5C4180DC3E10081660B /* DatabaseProcessProxyMac.mm */; };
5180C715180CCA3100FDA612 /* XPCServiceMain.Development.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839716B480F600A278FE /* XPCServiceMain.Development.mm */; };
5180C717180CCA3100FDA612 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
- 51829DA51637C70C000953D6 /* NetworkResourceLoadScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51829DA31637C70C000953D6 /* NetworkResourceLoadScheduler.cpp */; };
- 51829DA61637C70C000953D6 /* NetworkResourceLoadScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 51829DA41637C70C000953D6 /* NetworkResourceLoadScheduler.h */; };
51834592134532E90092B696 /* WebIconDatabaseClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51834590134532E80092B696 /* WebIconDatabaseClient.cpp */; };
51834593134532E90092B696 /* WebIconDatabaseClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 51834591134532E80092B696 /* WebIconDatabaseClient.h */; };
518353DA1885BF8C00D9FE44 /* IDBSerialization.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 518353D81885BF8C00D9FE44 /* IDBSerialization.cpp */; };
@@ -3086,7 +3083,6 @@
512A9766180E05D20039A149 /* DatabaseProcessProxy.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; name = DatabaseProcessProxy.messages.in; path = Databases/DatabaseProcessProxy.messages.in; sourceTree = "<group>"; };
512A9767180E09B80039A149 /* DatabaseProcessProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseProcessProxyMessageReceiver.cpp; sourceTree = "<group>"; };
512A9768180E09B80039A149 /* DatabaseProcessProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseProcessProxyMessages.h; sourceTree = "<group>"; };
- 512C068F16390E6900ABB911 /* NetworkResourceLoadSchedulerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkResourceLoadSchedulerMac.mm; sourceTree = "<group>"; };
512E3520130B550100ABD19A /* WebApplicationCacheManagerProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebApplicationCacheManagerProxy.cpp; sourceTree = "<group>"; };
512E3521130B550100ABD19A /* WebApplicationCacheManagerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebApplicationCacheManagerProxy.h; sourceTree = "<group>"; };
512E352B130B55AF00ABD19A /* WebApplicationCacheManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebApplicationCacheManager.cpp; path = ApplicationCache/WebApplicationCacheManager.cpp; sourceTree = "<group>"; };
@@ -3156,8 +3152,6 @@
517DD5BD180DA7D30081660B /* DatabaseProcessProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DatabaseProcessProxy.h; path = Databases/DatabaseProcessProxy.h; sourceTree = "<group>"; };
517DD5C4180DC3E10081660B /* DatabaseProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DatabaseProcessProxyMac.mm; path = Databases/mac/DatabaseProcessProxyMac.mm; sourceTree = "<group>"; };
5180C71D180CCA3100FDA612 /* com.apple.WebKit.Databases.Development.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.Databases.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
- 51829DA31637C70C000953D6 /* NetworkResourceLoadScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkResourceLoadScheduler.cpp; path = NetworkProcess/NetworkResourceLoadScheduler.cpp; sourceTree = "<group>"; };
- 51829DA41637C70C000953D6 /* NetworkResourceLoadScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkResourceLoadScheduler.h; path = NetworkProcess/NetworkResourceLoadScheduler.h; sourceTree = "<group>"; };
51834590134532E80092B696 /* WebIconDatabaseClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebIconDatabaseClient.cpp; sourceTree = "<group>"; };
51834591134532E80092B696 /* WebIconDatabaseClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebIconDatabaseClient.h; sourceTree = "<group>"; };
518353D81885BF8C00D9FE44 /* IDBSerialization.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBSerialization.cpp; sourceTree = "<group>"; };
@@ -5573,8 +5567,6 @@
51FD18B31651FBAD00DBE1CE /* NetworkResourceLoader.cpp */,
51FD18B41651FBAD00DBE1CE /* NetworkResourceLoader.h */,
E1525517170109FB003D7ADB /* NetworkResourceLoader.messages.in */,
- 51829DA31637C70C000953D6 /* NetworkResourceLoadScheduler.cpp */,
- 51829DA41637C70C000953D6 /* NetworkResourceLoadScheduler.h */,
E1B78470163F24690007B692 /* RemoteNetworkingContext.h */,
);
name = NetworkProcess;
@@ -5588,7 +5580,6 @@
5167EE9F170377BF007681CA /* NetworkDiskCacheMonitor.mm */,
51A8A6151627F3F9000D90E9 /* NetworkProcessMac.mm */,
51E3B67E16F266B3009968DC /* NetworkResourceLoaderMac.mm */,
- 512C068F16390E6900ABB911 /* NetworkResourceLoadSchedulerMac.mm */,
E1B78472163F253E0007B692 /* RemoteNetworkingContext.mm */,
);
name = mac;
@@ -7839,7 +7830,6 @@
51FD18B61651FBAD00DBE1CE /* NetworkResourceLoader.h in Headers */,
E152551B17011819003D7ADB /* NetworkResourceLoaderMessages.h in Headers */,
51CBBA10165219B6005BE8FD /* NetworkResourceLoadParameters.h in Headers */,
- 51829DA61637C70C000953D6 /* NetworkResourceLoadScheduler.h in Headers */,
31A2EC5614899C0900810D71 /* NotificationPermissionRequest.h in Headers */,
3131261F148FF82C00BA2A39 /* NotificationPermissionRequestManager.h in Headers */,
31A2EC521489981900810D71 /* NotificationPermissionRequestManagerProxy.h in Headers */,
@@ -9607,8 +9597,6 @@
51E3B67F16F266B3009968DC /* NetworkResourceLoaderMac.mm in Sources */,
E152551A17011819003D7ADB /* NetworkResourceLoaderMessageReceiver.cpp in Sources */,
51CBBA0F165219B6005BE8FD /* NetworkResourceLoadParameters.cpp in Sources */,
- 51829DA51637C70C000953D6 /* NetworkResourceLoadScheduler.cpp in Sources */,
- 512C069016390E6900ABB911 /* NetworkResourceLoadSchedulerMac.mm in Sources */,
BC8283AC16B4BF3F00A278FE /* NetworkServiceEntryPoint.mm in Sources */,
31A2EC551489982E00810D71 /* NotificationPermissionRequest.cpp in Sources */,
3131261E148FF82C00BA2A39 /* NotificationPermissionRequestManager.cpp in Sources */,
