[soup] Move important SoupSession feature initialization to WebCore

https://bugs.webkit.org/show_bug.cgi?id=68602

Reviewed by Martin Robinson.

Source/WebCore:

Moved content sniffer and decoder initialization from WebKit to
WebCore because network stuff will not work as expected without
them. Added also out-of-the-box proxy support to WebCore.

No new tests required as we're just moving stuff from WebKit to
WebCore.

* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::ResourceHandle::defaultSession):

Source/WebKit/gtk:

Moved content sniffer and decoder initialization from WebKit to
WebCore because network stuff will not work as expected without
them.

No new tests required as we're just moving stuff from WebKit to
WebCore.

* webkit/webkitglobals.cpp:
(webkitInit):

Source/WebKit2:

Moved content sniffer and decoder initialization from the
WebProcess to WebCore because network stuff will not work as
expected without them.

No new tests required as we're just moving stuff from the
WebProcess to WebCore.

* WebProcess/gtk/WebProcessMainGtk.cpp:
(WebKit::WebProcessMainGtk):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@107973 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 71435df..3a4e9b1 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2012-02-16  Sergio Villar Senin  <svillar@igalia.com>
+
+        [soup] Move important SoupSession feature initialization to WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=68602
+
+        Reviewed by Martin Robinson.
+
+        Moved content sniffer and decoder initialization from WebKit to
+        WebCore because network stuff will not work as expected without
+        them. Added also out-of-the-box proxy support to WebCore.
+
+        No new tests required as we're just moving stuff from WebKit to
+        WebCore.
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::ResourceHandle::defaultSession):
+
 2012-02-16  Julien Chaffraix  <jchaffraix@webkit.org>
 
         thead in table without tbody causes table height doubling

diff --git a/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
index 8058a5d..e671660 100644 (file)
--- a/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
+++ b/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
@@ -735,7 +735,10 @@ SoupSession* ResourceHandle::defaultSession()
         session = soup_session_async_new();
         g_object_set(session,
                      SOUP_SESSION_MAX_CONNS, maxConnections,
-                     SOUP_SESSION_MAX_CONNS_PER_HOST, maxConnectionsPerHost, 
+                     SOUP_SESSION_MAX_CONNS_PER_HOST, maxConnectionsPerHost,
+                     SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_CONTENT_DECODER,
+                     SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_CONTENT_SNIFFER,
+                     SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
                      NULL);
     }
 

diff --git a/Source/WebKit/gtk/ChangeLog b/Source/WebKit/gtk/ChangeLog
index 59fcb71..3140832 100644 (file)
--- a/Source/WebKit/gtk/ChangeLog
+++ b/Source/WebKit/gtk/ChangeLog
@@ -1,3 +1,20 @@
+2012-02-16  Sergio Villar Senin  <svillar@igalia.com>
+
+        [soup] Move important SoupSession feature initialization to WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=68602
+
+        Reviewed by Martin Robinson.
+
+        Moved content sniffer and decoder initialization from WebKit to
+        WebCore because network stuff will not work as expected without
+        them.
+
+        No new tests required as we're just moving stuff from WebKit to
+        WebCore.
+
+        * webkit/webkitglobals.cpp:
+        (webkitInit):
+
 2012-02-16  Philippe Normand  <pnormand@igalia.com>
 
         Unreviewed, rolling out r107941.

diff --git a/Source/WebKit/gtk/webkit/webkitglobals.cpp b/Source/WebKit/gtk/webkit/webkitglobals.cpp
index 3967c63..bc5d726 100644 (file)
--- a/Source/WebKit/gtk/webkit/webkitglobals.cpp
+++ b/Source/WebKit/gtk/webkit/webkitglobals.cpp
@@ -336,12 +336,6 @@ void webkitInit()
     soup_session_add_feature(session, authDialog);
     g_object_unref(authDialog);
 
-    SoupSessionFeature* sniffer = static_cast<SoupSessionFeature*>(g_object_new(SOUP_TYPE_CONTENT_SNIFFER, NULL));
-    soup_session_add_feature(session, sniffer);
-    g_object_unref(sniffer);
-
-    soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_DECODER);
-
 #if USE(CLUTTER)
     gtk_clutter_init(0, 0);
 #endif

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index f9e38a7..aa12153 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,20 @@
+2012-02-16  Sergio Villar Senin  <svillar@igalia.com>
+
+        [soup] Move important SoupSession feature initialization to WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=68602
+
+        Reviewed by Martin Robinson.
+
+        Moved content sniffer and decoder initialization from the
+        WebProcess to WebCore because network stuff will not work as
+        expected without them.
+
+        No new tests required as we're just moving stuff from the
+        WebProcess to WebCore.
+
+        * WebProcess/gtk/WebProcessMainGtk.cpp:
+        (WebKit::WebProcessMainGtk):
+
 2012-02-16  Philippe Normand  <pnormand@igalia.com>
 
         Unreviewed, rolling out r107941.

diff --git a/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp b/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp
index 18c506b..6f696e8 100644 (file)
--- a/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp
+++ b/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp
@@ -60,8 +60,6 @@ WK_EXPORT int WebProcessMainGtk(int argc, char* argv[])
     RunLoop::initializeMainRunLoop();
     SoupSession* session = WebCore::ResourceHandle::defaultSession();
 
-    soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_SNIFFER);
-    soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_DECODER);
     soup_session_add_feature_by_type(session, WEB_TYPE_AUTH_DIALOG);
 
     int socket = atoi(argv[1]);