Diff
Modified: trunk/ChangeLog (157503 => 157504)
--- trunk/ChangeLog 2013-10-16 08:51:13 UTC (rev 157503)
+++ trunk/ChangeLog 2013-10-16 09:07:12 UTC (rev 157504)
@@ -1,3 +1,15 @@
+2013-10-16 Csaba Osztrogonác <o...@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 Laszlo Gombos.
+
+ Original patch by Balazs Kelemen <kbal...@webkit.org>
+
+ * Source/cmake/WebKitFeatures.cmake:
+ * Source/cmakeconfig.h.cmake:
+
2013-10-10 Marcelo Morais <m.mor...@samsung.com>
Web Inspector: Remove the old front-end from WebKit
Modified: trunk/Source/WebKit2/CMakeLists.txt (157503 => 157504)
--- trunk/Source/WebKit2/CMakeLists.txt 2013-10-16 08:51:13 UTC (rev 157503)
+++ trunk/Source/WebKit2/CMakeLists.txt 2013-10-16 09:07:12 UTC (rev 157504)
@@ -2,6 +2,7 @@
"${_javascript_CORE_DIR}/llint"
"${WEBKIT2_DIR}"
"${WEBKIT2_DIR}/NetworkProcess"
+ "${WEBKIT2_DIR}/NetworkProcess/FileAPI"
"${WEBKIT2_DIR}/Platform"
"${WEBKIT2_DIR}/Platform/CoreIPC"
"${WEBKIT2_DIR}/PluginProcess"
@@ -12,7 +13,9 @@
"${WEBKIT2_DIR}/Shared/CoordinatedGraphics"
"${WEBKIT2_DIR}/Shared/CoreIPCSupport"
"${WEBKIT2_DIR}/Shared/Downloads"
+ "${WEBKIT2_DIR}/Shared/FileAPI"
"${WEBKIT2_DIR}/Shared/Network"
+ "${WEBKIT2_DIR}/Shared/Network/CustomProtocols"
"${WEBKIT2_DIR}/Shared/Plugins"
"${WEBKIT2_DIR}/Shared/Plugins/Netscape"
"${WEBKIT2_DIR}/Shared/Plugins/Netscape/x11"
@@ -36,6 +39,7 @@
"${WEBKIT2_DIR}/WebProcess/Cookies"
"${WEBKIT2_DIR}/WebProcess/Databases"
"${WEBKIT2_DIR}/WebProcess/Databases/IndexedDB"
+ "${WEBKIT2_DIR}/WebProcess/FileAPI"
"${WEBKIT2_DIR}/WebProcess/FullScreen"
"${WEBKIT2_DIR}/WebProcess/Geolocation"
"${WEBKIT2_DIR}/WebProcess/NetworkInfo"
@@ -46,6 +50,7 @@
"${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"
@@ -136,6 +141,17 @@
endif ()
set(WebKit2_SOURCES
+ NetworkProcess/AsynchronousNetworkLoaderClient.cpp
+ NetworkProcess/HostRecord.cpp
+ NetworkProcess/NetworkConnectionToWebProcess.cpp
+ NetworkProcess/NetworkProcess.cpp
+ NetworkProcess/NetworkProcessPlatformStrategies.cpp
+ NetworkProcess/NetworkResourceLoadScheduler.cpp
+ NetworkProcess/NetworkResourceLoader.cpp
+ NetworkProcess/SynchronousNetworkLoaderClient.cpp
+
+ NetworkProcess/FileAPI/NetworkBlobRegistry.cpp
+
Platform/Logging.cpp
Platform/Module.cpp
Platform/WorkQueue.cpp
@@ -177,6 +193,7 @@
Shared/SecurityOriginData.cpp
Shared/SessionState.cpp
Shared/ShareableBitmap.cpp
+ Shared/ShareableResource.cpp
Shared/StatisticsData.cpp
Shared/UpdateInfo.cpp
Shared/VisitedLinkTable.cpp
@@ -208,6 +225,7 @@
Shared/WebProcessCreationParameters.cpp
Shared/WebRenderLayer.cpp
Shared/WebRenderObject.cpp
+ Shared/WebResourceBuffer.cpp
Shared/WebTouchEvent.cpp
Shared/WebURLRequest.cpp
Shared/WebURLResponse.cpp
@@ -248,6 +266,11 @@
Shared/Downloads/DownloadAuthenticationClient.cpp
Shared/Downloads/DownloadManager.cpp
+ Shared/FileAPI/BlobRegistrationData.cpp
+
+ Shared/Network/NetworkProcessCreationParameters.cpp
+ Shared/Network/NetworkResourceLoadParameters.cpp
+
Shared/Plugins/NPIdentifierData.cpp
Shared/Plugins/NPObjectMessageReceiver.cpp
Shared/Plugins/NPObjectProxy.cpp
@@ -386,6 +409,8 @@
UIProcess/Launcher/ProcessLauncher.cpp
+ UIProcess/Network/NetworkProcessProxy.cpp
+
UIProcess/Notifications/NotificationPermissionRequest.cpp
UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp
UIProcess/Notifications/WebNotification.cpp
@@ -412,6 +437,8 @@
WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp
+ WebProcess/FileAPI/BlobRegistryProxy.cpp
+
WebProcess/FullScreen/WebFullScreenManager.cpp
WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp
@@ -457,6 +484,10 @@
WebProcess/MediaCache/WebMediaCacheManager.cpp
+ WebProcess/Network/NetworkProcessConnection.cpp
+ WebProcess/Network/WebResourceLoadScheduler.cpp
+ WebProcess/Network/WebResourceLoader.cpp
+
WebProcess/NetworkInfo/WebNetworkInfoManager.cpp
WebProcess/Notifications/NotificationPermissionRequestManager.cpp
@@ -528,6 +559,10 @@
)
set(WebKit2_MESSAGES_IN_FILES
+ NetworkProcess/NetworkConnectionToWebProcess.messages.in
+ NetworkProcess/NetworkProcess.messages.in
+ NetworkProcess/NetworkResourceLoader.messages.in
+
PluginProcess/PluginControllerProxy.messages.in
PluginProcess/PluginProcess.messages.in
PluginProcess/WebProcessConnection.messages.in
@@ -559,6 +594,8 @@
UIProcess/Downloads/DownloadProxy.messages.in
+ UIProcess/Network/NetworkProcessProxy.messages.in
+
UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.messages.in
UIProcess/Plugins/PluginProcessProxy.messages.in
@@ -581,6 +618,7 @@
WebProcess/MediaCache/WebMediaCacheManager.messages.in
+ WebProcess/Network/NetworkProcessConnection.messages.in
WebProcess/Network/WebResourceLoader.messages.in
WebProcess/NetworkInfo/WebNetworkInfoManager.messages.in
Modified: trunk/Source/WebKit2/ChangeLog (157503 => 157504)
--- trunk/Source/WebKit2/ChangeLog 2013-10-16 08:51:13 UTC (rev 157503)
+++ trunk/Source/WebKit2/ChangeLog 2013-10-16 09:07:12 UTC (rev 157504)
@@ -1,3 +1,15 @@
+2013-10-16 Csaba Osztrogonác <o...@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 Laszlo Gombos.
+
+ Original patch by Balazs Kelemen <kbal...@webkit.org>
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+
2013-10-16 Robert Plociennik <r.plocien...@samsung.com>
[EFL] Minibrowser can't load child window's location
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (157503 => 157504)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2013-10-16 08:51:13 UTC (rev 157503)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2013-10-16 09:07:12 UTC (rev 157504)
@@ -1,7 +1,10 @@
list(APPEND WebKit2_SOURCES
NetworkProcess/soup/NetworkProcessSoup.cpp
NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp
+ NetworkProcess/soup/RemoteNetworkingContextSoup.cpp
+ NetworkProcess/unix/NetworkProcessMainUnix.cpp
+
Platform/CoreIPC/unix/AttachmentUnix.cpp
Platform/CoreIPC/unix/ConnectionUnix.cpp
@@ -199,6 +202,7 @@
"${WEBCORE_DIR}/platform/graphics/cairo"
"${WEBCORE_DIR}/platform/network/soup"
"${WEBCORE_DIR}/platform/text/enchant"
+ "${WEBKIT2_DIR}/NetworkProcess/unix"
"${WEBKIT2_DIR}/Platform/efl"
"${WEBKIT2_DIR}/Shared/API/c/efl"
"${WEBKIT2_DIR}/Shared/Downloads/soup"
@@ -388,6 +392,27 @@
install(TARGETS PluginProcess 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
+ )
+
+ 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
@@ -417,6 +442,7 @@
-DLIBEXECDIR=\"${CMAKE_INSTALL_PREFIX}/${EXEC_INSTALL_DIR}\"
-DWEBPROCESSNAME=\"WebProcess\"
-DPLUGINPROCESSNAME=\"PluginProcess\"
+ -DNETWORKPROCESSNAME=\"NetworkProcess\"
)
add_library(ewk2UnitTestUtils
Modified: trunk/Source/cmake/WebKitFeatures.cmake (157503 => 157504)
--- trunk/Source/cmake/WebKitFeatures.cmake 2013-10-16 08:51:13 UTC (rev 157503)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2013-10-16 09:07:12 UTC (rev 157504)
@@ -92,6 +92,7 @@
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)
Modified: trunk/Source/cmakeconfig.h.cmake (157503 => 157504)
--- trunk/Source/cmakeconfig.h.cmake 2013-10-16 08:51:13 UTC (rev 157503)
+++ trunk/Source/cmakeconfig.h.cmake 2013-10-16 09:07:12 UTC (rev 157504)
@@ -82,6 +82,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_VISIBILITY_API
