Attachment 189069 Details for Bug 110139 – Patch

[patch] Patch

bug-110139-20130219145733.patch (text/plain), 12.34 KB, created by Balazs Kelemen on 2013-02-19 06:01:19 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Balazs Kelemen

Created: 2013-02-19 06:01:19 PST

Size: 12.34 KB

patch

obsolete

>Subversion Revision: 143321
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 840195b6fbe559b327c5b88381aed36ba7d2431a..429d72951eae04ed84f34060f0d08e297c67c0f9 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,5 +1,21 @@
> 2013-02-18  Balazs Kelemen  <kbalazs@webkit.org>
> 
>+        [WK2][Efl][CMake] Add support for ENABLE_NETWORK_PROCESS to the build system
>+        https://bugs.webkit.org/show_bug.cgi?id=110139
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add related files to the build. Add a common main file for the executable
>+        for non-Mac Unix ports. It is disabled by default for now since some minor
>+        fixes are missing to make it actually build.
>+
>+        * CMakeLists.txt:
>+        * PlatformEfl.cmake:
>+        * unix/NetworkMainUnix.cpp: Added.
>+        (main):
>+
>+2013-02-18  Balazs Kelemen  <kbalazs@webkit.org>
>+
>         [WK2][Soup] Add entry point for network process
>         https://bugs.webkit.org/show_bug.cgi?id=110136
> 
>diff --git a/Source/WebKit2/CMakeLists.txt b/Source/WebKit2/CMakeLists.txt
>index 7c1c0fd31bc122a74ed962d9cadf4573e155bdd9..35924142309c3321325003c6676c9f0ff472cda1 100644
>--- a/Source/WebKit2/CMakeLists.txt
>+++ b/Source/WebKit2/CMakeLists.txt
>@@ -1,5 +1,6 @@
> set(WebKit2_INCLUDE_DIRECTORIES
>     "${WEBKIT2_DIR}"
>+    "${WEBKIT2_DIR}/NetworkProcess"
>     "${WEBKIT2_DIR}/Platform"
>     "${WEBKIT2_DIR}/Platform/CoreIPC"
>     "${WEBKIT2_DIR}/PluginProcess"
>@@ -11,6 +12,7 @@ set(WebKit2_INCLUDE_DIRECTORIES
>     "${WEBKIT2_DIR}/Shared/CoreIPCSupport"
>     "${WEBKIT2_DIR}/Shared/Downloads"
>     "${WEBKIT2_DIR}/Shared/Network"
>+    "${WEBKIT2_DIR}/Shared/Network/CustomProtocols"
>     "${WEBKIT2_DIR}/Shared/Plugins"
>     "${WEBKIT2_DIR}/Shared/Plugins/Netscape"
>     "${WEBKIT2_DIR}/Shared/Plugins/Netscape/x11"
>@@ -23,6 +25,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"
>@@ -40,6 +43,7 @@ set(WebKit2_INCLUDE_DIRECTORIES
>     "${WEBKIT2_DIR}/WebProcess/InjectedBundle/DOM"
>     "${WEBKIT2_DIR}/WebProcess/Launching"
>     "${WEBKIT2_DIR}/WebProcess/MediaCache"
>+    "${WEBKIT2_DIR}/WebProcess/Network"
>     "${WEBKIT2_DIR}/WebProcess/Notifications"
>     "${WEBKIT2_DIR}/WebProcess/Plugins"
>     "${WEBKIT2_DIR}/WebProcess/Plugins/Netscape"
>@@ -118,6 +122,14 @@ set(WebKit2_INCLUDE_DIRECTORIES
> )
> 
> set(WebKit2_SOURCES
>+    NetworkProcess/HostRecord.cpp
>+    NetworkProcess/NetworkConnectionToWebProcess.cpp
>+    NetworkProcess/NetworkProcess.cpp
>+    NetworkProcess/NetworkResourceLoader.cpp
>+    NetworkProcess/NetworkResourceLoadScheduler.cpp
>+    NetworkProcess/SchedulableLoader.cpp
>+    NetworkProcess/SyncNetworkResourceLoader.cpp
>+
>     Platform/Logging.cpp
>     Platform/Module.cpp
>     Platform/WorkQueue.cpp
>@@ -158,6 +170,7 @@ set(WebKit2_SOURCES
>     Shared/SecurityOriginData.cpp
>     Shared/SessionState.cpp
>     Shared/ShareableBitmap.cpp
>+    Shared/ShareableResource.cpp
>     Shared/StatisticsData.cpp
>     Shared/UpdateInfo.cpp
>     Shared/VisitedLinkTable.cpp
>@@ -190,6 +203,7 @@ set(WebKit2_SOURCES
>     Shared/WebProcessCreationParameters.cpp
>     Shared/WebRenderLayer.cpp
>     Shared/WebRenderObject.cpp
>+    Shared/WebResourceBuffer.cpp
>     Shared/WebTouchEvent.cpp
>     Shared/WebURLRequest.cpp
>     Shared/WebURLResponse.cpp
>@@ -223,6 +237,9 @@ set(WebKit2_SOURCES
>     Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp
>     Shared/CoordinatedGraphics/WebCustomFilterProgramProxy.cpp
> 
>+    Shared/Network/NetworkProcessCreationParameters.cpp
>+    Shared/Network/NetworkResourceLoadParameters.cpp
>+
>     Shared/Plugins/NPIdentifierData.cpp
>     Shared/Plugins/NPObjectMessageReceiver.cpp
>     Shared/Plugins/NPObjectProxy.cpp
>@@ -356,6 +373,8 @@ set(WebKit2_SOURCES
> 
>     UIProcess/Launcher/ProcessLauncher.cpp
> 
>+    UIProcess/Network/NetworkProcessProxy.cpp
>+
>     UIProcess/Notifications/NotificationPermissionRequest.cpp
>     UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp
>     UIProcess/Notifications/WebNotification.cpp
>@@ -368,6 +387,8 @@ set(WebKit2_SOURCES
>     UIProcess/Plugins/PluginProcessProxy.cpp
>     UIProcess/Plugins/WebPluginSiteDataManager.cpp
> 
>+    UIProcess/soup/WebContextSoup.cpp
>+
>     WebProcess/WebConnectionToUIProcess.cpp
>     WebProcess/WebProcess.cpp
> 
>@@ -430,6 +451,10 @@ set(WebKit2_SOURCES
> 
>     WebProcess/NetworkInfo/WebNetworkInfoManager.cpp
> 
>+    WebProcess/Network/NetworkProcessConnection.cpp
>+    WebProcess/Network/WebResourceLoadScheduler.cpp
>+    WebProcess/Network/WebResourceLoader.cpp
>+
>     WebProcess/Notifications/NotificationPermissionRequestManager.cpp
>     WebProcess/Notifications/WebNotificationManager.cpp
> 
>@@ -496,6 +521,9 @@ set(WebKit2_SOURCES
> )
> 
> set(WebKit2_MESSAGES_IN_FILES
>+    NetworkProcess/NetworkConnectionToWebProcess.messages.in
>+    NetworkProcess/NetworkProcess.messages.in
>+
>     PluginProcess/PluginControllerProxy.messages.in
>     PluginProcess/PluginProcess.messages.in
>     PluginProcess/WebProcessConnection.messages.in
>@@ -528,6 +556,8 @@ set(WebKit2_MESSAGES_IN_FILES
> 
>     UIProcess/Downloads/DownloadProxy.messages.in
> 
>+    UIProcess/Network/NetworkProcessProxy.messages.in
>+
>     UIProcess/Notifications/WebNotificationManagerProxy.messages.in
> 
>     UIProcess/Plugins/PluginProcessProxy.messages.in
>@@ -550,6 +580,9 @@ set(WebKit2_MESSAGES_IN_FILES
> 
>     WebProcess/MediaCache/WebMediaCacheManager.messages.in
> 
>+    WebProcess/Network/NetworkProcessConnection.messages.in
>+    WebProcess/Network/WebResourceLoader.messages.in
>+
>     WebProcess/NetworkInfo/WebNetworkInfoManager.messages.in
> 
>     WebProcess/Notifications/WebNotificationManager.messages.in
>diff --git a/Source/WebKit2/PlatformEfl.cmake b/Source/WebKit2/PlatformEfl.cmake
>index 7fa4ec9751b4f41f284c138b859abb90885ddbce..7168a289488591fb9005c7541d68bc5d204780d2 100644
>--- a/Source/WebKit2/PlatformEfl.cmake
>+++ b/Source/WebKit2/PlatformEfl.cmake
>@@ -1,4 +1,9 @@
> list(APPEND WebKit2_SOURCES
>+    NetworkProcess/efl/NetworkProcessEfl.cpp
>+    NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp
>+    NetworkProcess/soup/RemoteNetworkingContextSoup.cpp
>+    NetworkProcess/unix/NetworkProcessMainUnix.cpp
>+
>     Platform/efl/LoggingEfl.cpp
>     Platform/efl/ModuleEfl.cpp
>     Platform/efl/WorkQueueEfl.cpp
>@@ -113,6 +118,8 @@ list(APPEND WebKit2_SOURCES
>     UIProcess/efl/WebView.cpp
>     UIProcess/efl/WebViewClient.cpp
> 
>+    UIProcess/soup/WebContextSoup.cpp
>+
>     UIProcess/InspectorServer/efl/WebInspectorServerEfl.cpp
>     UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp
> 
>@@ -122,6 +129,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
> 
>@@ -167,6 +176,7 @@ list(APPEND WebKit2_INCLUDE_DIRECTORIES
>     "${WEBCORE_DIR}/platform/network/soup"
>     "${WEBCORE_DIR}/platform/text/enchant"
>     "${WEBCORE_DIR}/svg/graphics"
>+    "${WEBKIT2_DIR}/NetworkProcess/unix"
>     "${WEBKIT2_DIR}/Shared/Downloads/soup"
>     "${WEBKIT2_DIR}/Shared/efl"
>     "${WEBKIT2_DIR}/Shared/soup"
>@@ -327,6 +337,27 @@ if (ENABLE_PLUGIN_PROCESS)
>     install(TARGETS ${PluginProcess_EXECUTABLE_NAME} DESTINATION "${EXEC_INSTALL_DIR}")
> endif () # ENABLE_PLUGIN_PROCESS
> 
>+if (ENABLE_NETWORK_PROCESS)
>+    set(NetworkProcess_EXECUTABLE_NAME NetworkProcess)
>+    list(APPEND NetworkProcess_INCLUDE_DIRECTORIES
>+        "${WEBKIT2_DIR}/NetworkProcess"
>+    )
>+
>+    include_directories(${NetworkProcess_INCLUDE_DIRECTORIES})
>+
>+    list(APPEND NetworkProcess_SOURCES
>+        ${WEBKIT2_DIR}/unix/NetworkMainUnix.cpp
>+    )
>+
>+    set(NetworkProcess_LIBRARIES
>+        ${WebKit2_LIBRARY_NAME}
>+    )
>+
>+    add_executable(${NetworkProcess_EXECUTABLE_NAME} ${NetworkProcess_SOURCES})
>+    target_link_libraries(${NetworkProcess_EXECUTABLE_NAME} ${NetworkProcess_LIBRARIES})
>+    install(TARGETS ${NetworkProcess_EXECUTABLE_NAME} DESTINATION "${EXEC_INSTALL_DIR}")
>+endif ()
>+
> include_directories(${THIRDPARTY_DIR}/gtest/include)
> 
> set(EWK2UnitTests_LIBRARIES
>@@ -357,6 +388,7 @@ add_definitions(-DTEST_RESOURCES_DIR=\"${TEST_RESOURCES_DIR}\"
>     -DLIBEXECDIR=\"${CMAKE_INSTALL_PREFIX}/${EXEC_INSTALL_DIR}\"
>     -DWEBPROCESSNAME=\"${WebProcess_EXECUTABLE_NAME}\"
>     -DPLUGINPROCESSNAME=\"${PluginProcess_EXECUTABLE_NAME}\"
>+    -DNETWORKPROCESSNAME=\"${NetworkProcess_EXECUTABLE_NAME}\"
> )
> 
> add_library(ewk2UnitTestUtils
>diff --git a/Source/WebKit2/unix/NetworkMainUnix.cpp b/Source/WebKit2/unix/NetworkMainUnix.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..609f03c4ac4ed43cba463687d0a3e8e9f796be14
>--- /dev/null
>+++ b/Source/WebKit2/unix/NetworkMainUnix.cpp
>@@ -0,0 +1,37 @@
>+/*
>+ * Copyright (C) 2013 University of Szeged. 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 THE COPYRIGHT HOLDER ``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 "NetworkProcessMainUnix.h"
>+
>+int main(int argc, char** argv)
>+{
>+    return WebKit::NetworkProcessMain(argc, argv);
>+}
>+
>+#endif
>diff --git a/Source/cmake/WebKitFeatures.cmake b/Source/cmake/WebKitFeatures.cmake
>index 7cd67fb62b9387f3dbf6b138ee06a3b8e7fd06c2..614f2ea148e225c648b828073936feab03ebb007 100644
>--- a/Source/cmake/WebKitFeatures.cmake
>+++ b/Source/cmake/WebKitFeatures.cmake
>@@ -91,6 +91,7 @@ macro(WEBKIT_OPTION_BEGIN)
>     WEBKIT_OPTION_DEFINE(ENABLE_NOSNIFF "Toggle support for 'X-Content-Type-Options: nosniff'" OFF)
>     WEBKIT_OPTION_DEFINE(ENABLE_NETSCAPE_PLUGIN_API "Toggle Netscape Plugin support" ON)
>     WEBKIT_OPTION_DEFINE(ENABLE_NETWORK_INFO "Toggle Network Information API support" OFF)
>+    WEBKIT_OPTION_DEFINE(ENABLE_NETWORK_PROCESS "Toggle dedicated network process support in WebKit2" OFF)
>     WEBKIT_OPTION_DEFINE(ENABLE_NOTIFICATIONS "Toggle Desktop Notifications Support" OFF)
>     WEBKIT_OPTION_DEFINE(ENABLE_ORIENTATION_EVENTS "Toggle Orientation Events support" OFF)
>     WEBKIT_OPTION_DEFINE(ENABLE_PAGE_VISIBILITY_API "Toggle Page Visibility API support" OFF)
>diff --git a/Source/cmakeconfig.h.cmake b/Source/cmakeconfig.h.cmake
>index 95bee0dc83629568d0c1172bd45df340efed0c6d..ee2cd5931b0a5c30f9a3abb0f3cd958946691a75 100644
>--- a/Source/cmakeconfig.h.cmake
>+++ b/Source/cmakeconfig.h.cmake
>@@ -84,6 +84,7 @@
> #cmakedefine01 ENABLE_NOSNIFF
> #cmakedefine01 ENABLE_NETSCAPE_PLUGIN_API
> #cmakedefine01 ENABLE_NETWORK_INFO
>+#cmakedefine01 ENABLE_NETWORK_PROCESS
> #cmakedefine01 ENABLE_NOTIFICATIONS
> #cmakedefine01 ENABLE_ORIENTATION_EVENTS
> #cmakedefine01 ENABLE_PAGE_POPUP
>diff --git a/ChangeLog b/ChangeLog
>index 92df09536f650cc9018dd59569e345bc1879bcf9..b906125cee3274a49bcb878ec6008f364e0c2237 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,12 @@
>+2013-02-18  Balazs Kelemen  <kbalazs@webkit.org>
>+
>+        [WK2][Efl][CMake] Add support for ENABLE_NETWORK_PROCESS to the build system
>+        https://bugs.webkit.org/show_bug.cgi?id=110139
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Source/cmakeconfig.h.cmake:
>+
> 2013-02-18  ChangSeok Oh  <shivamidow@gmail.com>
> 
>         [GTK] Fix nits for configuration

Actions: View | Formatted Diff | Diff

Attachments on bug 110139: 188915 | 189069 | 213003 | 214250