Attachment 213880 Details for Bug 110115 – =patch for landing

[patch] =patch for landing

bug-110115-20131010154808.patch (text/plain), 15.13 KB, created by Csaba Osztrogonác on 2013-10-10 06:48:10 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Csaba Osztrogonác

Created: 2013-10-10 06:48:10 PDT

Size: 15.13 KB

patch

obsolete

>Subversion Revision: 157217
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index b40e0a78c34e8cd2b758c4abec2c7e000f62977d..331b31aaf2b8d422c3f6718bda4e5183153ff95f 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,32 @@
>+2013-10-10  Csaba OsztrogonÃ¡c  <ossy@webkit.org>
>+
>+        [WK2][Soup] Add platform specific stubs for NetworkProcess
>+        https://bugs.webkit.org/show_bug.cgi?id=110115
>+
>+        Reviewed by Carlos Garcia Campos.
>+
>+        Original patch by Balazs Kelemen <kbalazs@webkit.org> and Kwang Yul Seo  <skyul@company100.net>.
>+
>+        * CMakeLists.txt:
>+        * GNUmakefile.am:
>+        * GNUmakefile.list.am:
>+        * NetworkProcess/gtk/NetworkProcessSoup.cpp: Added.
>+        (WebKit::NetworkProcess::platformInitializeNetworkProcess):
>+        (WebKit::NetworkProcess::platformSetCacheModel):
>+        (WebKit::NetworkProcess::allowSpecificHTTPSCertificateForHost):
>+        Stubs.
>+        (WebKit::NetworkProcess::clearCacheForAllOrigins):
>+        (WebKit::NetworkProcess::platformTerminate):
>+        * NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp: Added.
>+        (WebKit::NetworkResourceLoadScheduler::platformInitializeMaximumHTTPConnectionCountPerHost):
>+        Added platform default based on the comment in ResourceRequestSoup.cpp.
>+        * UIProcess/Network/soup/NetworkProcessProxySoup.cpp: Added.
>+        (WebKit::NetworkProcessProxy::platformGetLaunchOptions):
>+        Stub.
>+        * UIProcess/soup/WebContextSoup.cpp: Added.
>+        (WebKit::WebContext::platformInitializeNetworkProcess):
>+        Stub.
>+
> 2013-10-09  Sergio Correia  <sergio.correia@openbossa.org>
> 
>         Set view to active in ViewClientEfl after WebProcess has relaunched
>diff --git a/Source/WebKit2/CMakeLists.txt b/Source/WebKit2/CMakeLists.txt
>index 711b482a8c172f28742c9f80b552b4bef489ecc8..64ebf3f6e5528c439aa33c148f251cfd0956edeb 100644
>--- a/Source/WebKit2/CMakeLists.txt
>+++ b/Source/WebKit2/CMakeLists.txt
>@@ -1,6 +1,7 @@
> set(WebKit2_INCLUDE_DIRECTORIES
>     "${JAVASCRIPTCORE_DIR}/llint"
>     "${WEBKIT2_DIR}"
>+    "${WEBKIT2_DIR}/NetworkProcess"
>     "${WEBKIT2_DIR}/Platform"
>     "${WEBKIT2_DIR}/Platform/CoreIPC"
>     "${WEBKIT2_DIR}/PluginProcess"
>@@ -25,6 +26,7 @@ set(WebKit2_INCLUDE_DIRECTORIES
>     "${WEBKIT2_DIR}/UIProcess/Downloads"
>     "${WEBKIT2_DIR}/UIProcess/InspectorServer"
>     "${WEBKIT2_DIR}/UIProcess/Launcher"
>+    "${WEBKIT2_DIR}/UIProcess/Network"
>     "${WEBKIT2_DIR}/UIProcess/Notifications"
>     "${WEBKIT2_DIR}/UIProcess/Plugins"
>     "${WEBKIT2_DIR}/UIProcess/Storage"
>diff --git a/Source/WebKit2/GNUmakefile.am b/Source/WebKit2/GNUmakefile.am
>index c1da315b43dc22dea99357fd9b15559625a9b91a..c396a9457062f434cb4693dcaaf615e1a1db380b 100644
>--- a/Source/WebKit2/GNUmakefile.am
>+++ b/Source/WebKit2/GNUmakefile.am
>@@ -95,6 +95,7 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPP
> 	-I$(srcdir)/Source/WebKit/gtk \
> 	-I$(srcdir)/Source/WebKit2 \
> 	-I$(srcdir)/Source/WebKit2/gtk \
>+	-I$(srcdir)/Source/WebKit2/NetworkProcess \
> 	-I$(srcdir)/Source/WebKit2/Platform \
> 	-I$(srcdir)/Source/WebKit2/Platform/CoreIPC \
> 	-I$(srcdir)/Source/WebKit2/Platform/CoreIPC/gtk \
>@@ -127,6 +128,7 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPP
> 	-I$(srcdir)/Source/WebKit2/UIProcess/gtk \
> 	-I$(srcdir)/Source/WebKit2/UIProcess/Launcher \
> 	-I$(srcdir)/Source/WebKit2/UIProcess/Launcher/gtk \
>+	-I$(srcdir)/Source/WebKit2/UIProcess/Network \
> 	-I$(srcdir)/Source/WebKit2/UIProcess/Notifications \
> 	-I$(srcdir)/Source/WebKit2/UIProcess/Plugins \
> 	-I$(srcdir)/Source/WebKit2/UIProcess/Plugins/unix \
>diff --git a/Source/WebKit2/GNUmakefile.list.am b/Source/WebKit2/GNUmakefile.list.am
>index 19fd594258b278303057ae0e70d1b6a8872bc2ce..f7c01490ac84d445b16cfd9c8878639c4bd4f826 100644
>--- a/Source/WebKit2/GNUmakefile.list.am
>+++ b/Source/WebKit2/GNUmakefile.list.am
>@@ -300,6 +300,8 @@ webkit2platform_sources += \
> 
> webkit2_sources += \
> 	Source/WebKit2/config.h \
>+	Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp \
>+	Source/WebKit2/NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp \
> 	Source/WebKit2/PluginProcess/PluginControllerProxy.cpp \
> 	Source/WebKit2/PluginProcess/PluginControllerProxy.h \
> 	Source/WebKit2/PluginProcess/PluginCreationParameters.cpp \
>@@ -854,6 +856,7 @@ webkit2_sources += \
> 	Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp \
> 	Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp \
> 	Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h \
>+	Source/WebKit2/UIProcess/Network/soup/NetworkProcessProxySoup.cpp \
> 	Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequest.cpp \
> 	Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequest.h \
> 	Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp \
>@@ -888,6 +891,7 @@ webkit2_sources += \
> 	Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h \
> 	Source/WebKit2/UIProcess/Storage/StorageManager.cpp \
> 	Source/WebKit2/UIProcess/Storage/StorageManager.h \
>+	Source/WebKit2/UIProcess/soup/WebContextSoup.cpp \
> 	Source/WebKit2/UIProcess/soup/WebCookieManagerProxySoup.cpp \
> 	Source/WebKit2/UIProcess/soup/WebSoupRequestManagerClient.cpp \
> 	Source/WebKit2/UIProcess/soup/WebSoupRequestManagerClient.h \
>diff --git a/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp b/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..d8ebacbd0d7f4515ced10c1734bc417cebbc9ef6
>--- /dev/null
>+++ b/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp
>@@ -0,0 +1,64 @@
>+/*
>+ * Copyright (C) 2013 Apple Inc. All rights reserved.
>+ * Copyright (C) 2013 Comapny 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 "NetworkProcess.h"
>+
>+#include "NetworkProcessCreationParameters.h"
>+#include <WebCore/NotImplemented.h>
>+
>+using namespace WebCore;
>+
>+namespace WebKit {
>+
>+void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreationParameters&)
>+{
>+}
>+
>+void NetworkProcess::platformSetCacheModel(CacheModel)
>+{
>+    notImplemented();
>+}
>+
>+void NetworkProcess::allowSpecificHTTPSCertificateForHost(const PlatformCertificateInfo&, const String&)
>+{
>+    notImplemented();
>+}
>+
>+void NetworkProcess::clearCacheForAllOrigins(uint32_t cachesToClear)
>+{
>+    notImplemented();
>+}
>+
>+void NetworkProcess::platformTerminate()
>+{
>+    notImplemented();
>+}
>+
>+} // namespace WebKit
>+
>+#endif
>diff --git a/Source/WebKit2/NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp b/Source/WebKit2/NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..9d03979e318a793acc6516e8a3edbc217c808c08
>--- /dev/null
>+++ b/Source/WebKit2/NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp
>@@ -0,0 +1,49 @@
>+/*
>+ * 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::platformInitializeMaximumHTTPConnectionCountPerHost()
>+{
>+    // Soup has its own queue control; it wants to have all requests given to
>+    // it, so that it is able to look ahead, and schedule them in a good way.
>+    // See the comment in ResourceRequestSoup.cpp
>+    static const unsigned unlimitedConnectionCount = 10000;
>+
>+    // FIXME: Take advantage of Web-platform specific knowledge that can help
>+    // prioritization better than libsoup alone can do.
>+    // See https://bugs.webkit.org/show_bug.cgi?id=110115#c13
>+    m_maxRequestsInFlightPerHost = unlimitedConnectionCount;
>+}
>+
>+} // namespace WebKit
>+
>+#endif
>diff --git a/Source/WebKit2/PlatformEfl.cmake b/Source/WebKit2/PlatformEfl.cmake
>index 88050c1983a65bf57b49dc9bc977cffc5df7519b..bd5ed0e8efb5043d2d903e7ef69ff59ef37ebdfb 100644
>--- a/Source/WebKit2/PlatformEfl.cmake
>+++ b/Source/WebKit2/PlatformEfl.cmake
>@@ -1,4 +1,7 @@
> list(APPEND WebKit2_SOURCES
>+    NetworkProcess/soup/NetworkProcessSoup.cpp
>+    NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp
>+
>     Platform/CoreIPC/unix/AttachmentUnix.cpp
>     Platform/CoreIPC/unix/ConnectionUnix.cpp
> 
>@@ -109,6 +112,8 @@ list(APPEND WebKit2_SOURCES
> 
>     UIProcess/Launcher/efl/ProcessLauncherEfl.cpp
> 
>+    UIProcess/Network/soup/NetworkProcessProxySoup.cpp
>+
>     UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
>     UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp
> 
>@@ -148,6 +153,7 @@ list(APPEND WebKit2_SOURCES
>     UIProcess/efl/WebUIPopupMenuClient.cpp
>     UIProcess/efl/WebViewEfl.cpp
> 
>+    UIProcess/soup/WebContextSoup.cpp
>     UIProcess/soup/WebCookieManagerProxySoup.cpp
>     UIProcess/soup/WebSoupRequestManagerClient.cpp
>     UIProcess/soup/WebSoupRequestManagerProxy.cpp
>diff --git a/Source/WebKit2/UIProcess/Network/soup/NetworkProcessProxySoup.cpp b/Source/WebKit2/UIProcess/Network/soup/NetworkProcessProxySoup.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..7e0d225de29d181faa7c5ee0211069b91dc9b877
>--- /dev/null
>+++ b/Source/WebKit2/UIProcess/Network/soup/NetworkProcessProxySoup.cpp
>@@ -0,0 +1,39 @@
>+/*
>+ * Copyright (C) 2012 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#include "config.h"
>+#if ENABLE(NETWORK_PROCESS)
>+
>+#include "NetworkProcessProxy.h"
>+
>+namespace WebKit {
>+
>+void NetworkProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
>+{
>+}
>+
>+}
>+
>+#endif // ENABLE(NETWORK_PROCESS)
>diff --git a/Source/WebKit2/UIProcess/soup/WebContextSoup.cpp b/Source/WebKit2/UIProcess/soup/WebContextSoup.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..9cb9cdf3da6d6f02c45f40eb5e781ddc92b5ddbf
>--- /dev/null
>+++ b/Source/WebKit2/UIProcess/soup/WebContextSoup.cpp
>@@ -0,0 +1,40 @@
>+/*
>+ * Copyright (C) 2012 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#include "config.h"
>+#if ENABLE(NETWORK_PROCESS)
>+#include "WebContext.h"
>+
>+#include "NetworkProcessCreationParameters.h"
>+
>+namespace WebKit {
>+
>+void WebContext::platformInitializeNetworkProcess(NetworkProcessCreationParameters&)
>+{
>+}
>+
>+}
>+
>+#endif

Actions: View | Formatted Diff | Diff

Attachments on bug 110115: 188906 | 205783 | 205966 | 206004 | 206005 | 206200 | 206202 | 207494 | 213880