Changeset 162190 in webkit

Timestamp:

Jan 16, 2014 11:50:46 PM (10 years ago)

Author:

Carlos Garcia Campos

Message:

[SOUP] Add stubs for CustomProtocol classes
​https://bugs.webkit.org/show_bug.cgi?id=126343

Reviewed by Gustavo Noronha Silva.

• CMakeLists.txt:
• GNUmakefile.am:
• GNUmakefile.list.am:
• PlatformGTK.cmake:
• Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp: Added.

(WebKit::generateCustomProtocolID):
(WebKit::WebSoupRequestAsyncData::WebSoupRequestAsyncData):
(WebKit::WebSoupRequestAsyncData::~WebSoupRequestAsyncData):
(WebKit::WebSoupRequestAsyncData::requestFailed):
(WebKit::WebSoupRequestAsyncData::releaseTask):
(WebKit::CustomProtocolManager::supplementName):
(WebKit::CustomProtocolManager::CustomProtocolManager):
(WebKit::CustomProtocolManager::initializeConnection):
(WebKit::CustomProtocolManager::initialize):

• Shared/Network/NetworkProcessCreationParameters.cpp:

(WebKit::NetworkProcessCreationParameters::encode): Move
urlSchemesRegisteredForCustomProtocols encoding out of platform
ifdefs, since it's already guarded by ENABLE(CUSTOM_PROTOCOLS).
(WebKit::NetworkProcessCreationParameters::decode): Ditto.

• Shared/Network/NetworkProcessCreationParameters.h: Ditto.
• UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp: Added.

(WebKit::CustomProtocolManagerProxy::CustomProtocolManagerProxy):
(WebKit::CustomProtocolManagerProxy::startLoading):
(WebKit::CustomProtocolManagerProxy::stopLoading):

Location:

trunk/Source/WebKit2

Files:

• CMakeLists.txt (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (2 diffs)
• GNUmakefile.list.am (modified) (3 diffs)
• PlatformGTK.cmake (modified) (2 diffs)
• Shared/Network/CustomProtocols/soup (added)
• Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp (added)
• Shared/Network/NetworkProcessCreationParameters.cpp (modified) (4 diffs)
• Shared/Network/NetworkProcessCreationParameters.h (modified) (2 diffs)
• UIProcess/Network/CustomProtocols/soup (added)
• UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp (added)

trunk/Source/WebKit2/CMakeLists.txt

@@ -32 +32 @@
     "${WEBKIT2_DIR}/UIProcess/Launcher"
     "${WEBKIT2_DIR}/UIProcess/Network"
+    "${WEBKIT2_DIR}/UIProcess/Network/CustomProtocols"
     "${WEBKIT2_DIR}/UIProcess/Notifications"
     "${WEBKIT2_DIR}/UIProcess/Plugins"
@@ -590 +591 @@
     Shared/Plugins/NPObjectMessageReceiver.messages.in
 
+    Shared/Network/CustomProtocols/CustomProtocolManager.messages.in
+
     UIProcess/DrawingAreaProxy.messages.in
     UIProcess/WebApplicationCacheManagerProxy.messages.in

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-16  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] Add stubs for CustomProtocol classes
+        https://bugs.webkit.org/show_bug.cgi?id=126343
+
+        Reviewed by Gustavo Noronha Silva.
+
+        * CMakeLists.txt:
+        * GNUmakefile.am:
+        * GNUmakefile.list.am:
+        * PlatformGTK.cmake:
+        * Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp: Added.
+        (WebKit::generateCustomProtocolID):
+        (WebKit::WebSoupRequestAsyncData::WebSoupRequestAsyncData):
+        (WebKit::WebSoupRequestAsyncData::~WebSoupRequestAsyncData):
+        (WebKit::WebSoupRequestAsyncData::requestFailed):
+        (WebKit::WebSoupRequestAsyncData::releaseTask):
+        (WebKit::CustomProtocolManager::supplementName):
+        (WebKit::CustomProtocolManager::CustomProtocolManager):
+        (WebKit::CustomProtocolManager::initializeConnection):
+        (WebKit::CustomProtocolManager::initialize):
+        * Shared/Network/NetworkProcessCreationParameters.cpp:
+        (WebKit::NetworkProcessCreationParameters::encode): Move
+        urlSchemesRegisteredForCustomProtocols encoding out of platform
+        ifdefs, since it's already guarded by ENABLE(CUSTOM_PROTOCOLS).
+        (WebKit::NetworkProcessCreationParameters::decode): Ditto.
+        * Shared/Network/NetworkProcessCreationParameters.h: Ditto.
+        * UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp: Added.
+        (WebKit::CustomProtocolManagerProxy::CustomProtocolManagerProxy):
+        (WebKit::CustomProtocolManagerProxy::startLoading):
+        (WebKit::CustomProtocolManagerProxy::stopLoading):
+
 2014-01-16  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/GNUmakefile.am

@@ -122 +122 @@
         -I$(srcdir)/Source/WebKit2/UIProcess/Launcher/gtk \
         -I$(srcdir)/Source/WebKit2/UIProcess/Network \
+        -I$(srcdir)/Source/WebKit2/UIProcess/Network/CustomProtocols \
         -I$(srcdir)/Source/WebKit2/UIProcess/Notifications \
         -I$(srcdir)/Source/WebKit2/UIProcess/Plugins \
@@ -415 +416 @@
         $(WebKit2)/Shared \
         $(WebKit2)/Shared/Authentication \
+        $(WebKit2)/Shared/Network/CustomProtocols \
         $(WebKit2)/Shared/Plugins \
         $(WebKit2)/UIProcess \

trunk/Source/WebKit2/GNUmakefile.list.am

@@ -55 +55 @@
         DerivedSources/WebKit2/CustomProtocolManagerProxyMessageReceiver.cpp \
         DerivedSources/WebKit2/CustomProtocolManagerProxyMessages.h \
+        DerivedSources/WebKit2/CustomProtocolManagerMessageReceiver.cpp \
+        DerivedSources/WebKit2/CustomProtocolManagerMessages.h \
         DerivedSources/WebKit2/DownloadProxyMessageReceiver.cpp \
         DerivedSources/WebKit2/DownloadProxyMessages.h \
@@ -402 +404 @@
         Source/WebKit2/Shared/NativeWebWheelEvent.h \
         Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h \
+        Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp \
         Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp \
         Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h \
@@ -833 +836 @@
         Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp \
         Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h \
+        Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h \
+        Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp \
         Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp \
         Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h \

trunk/Source/WebKit2/PlatformGTK.cmake

@@ -37 +37 @@
 
     Shared/Downloads/soup/DownloadSoup.cpp
+
+    Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp
 
     Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
@@ -234 +236 @@
     UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp
 
+    UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp
+
     UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
     UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp

trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp

@@ -44 +44 @@
     encoder << diskCacheDirectoryExtensionHandle;
     encoder << shouldUseTestingNetworkSession;
+#if ENABLE(CUSTOM_PROTOCOLS)
+    encoder << urlSchemesRegisteredForCustomProtocols;
+#endif
 #if PLATFORM(MAC)
     encoder << parentProcessName;
@@ -49 +52 @@
     encoder << nsURLCacheMemoryCapacity;
     encoder << nsURLCacheDiskCapacity;
-#if ENABLE(CUSTOM_PROTOCOLS)
-    encoder << urlSchemesRegisteredForCustomProtocols;
-#endif
     encoder << httpProxy;
     encoder << httpsProxy;
@@ -76 +76 @@
     if (!decoder.decode(result.shouldUseTestingNetworkSession))
         return false;
+#if ENABLE(CUSTOM_PROTOCOLS)
+    if (!decoder.decode(result.urlSchemesRegisteredForCustomProtocols))
+        return false;
+#endif
 #if PLATFORM(MAC)
     if (!decoder.decode(result.parentProcessName))
@@ -85 +89 @@
     if (!decoder.decode(result.nsURLCacheDiskCapacity))
         return false;
-#if ENABLE(CUSTOM_PROTOCOLS)
-    if (!decoder.decode(result.urlSchemesRegisteredForCustomProtocols))
-        return false;
-#endif
     if (!decoder.decode(result.httpProxy))
         return false;

trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h

@@ -59 +59 @@
     bool shouldUseTestingNetworkSession;
 
+#if ENABLE(CUSTOM_PROTOCOLS)
+    Vector<String> urlSchemesRegisteredForCustomProtocols;
+#endif
+
 #if PLATFORM(MAC)
     String parentProcessName;
@@ -64 +68 @@
     uint64_t nsURLCacheMemoryCapacity;
     uint64_t nsURLCacheDiskCapacity;
-
-#if ENABLE(CUSTOM_PROTOCOLS)
-    Vector<String> urlSchemesRegisteredForCustomProtocols;
-#endif
 
     String httpProxy;