summaryrefslogtreecommitdiff
path: root/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-02-24 16:36:50 +0100
committerSimon Hausmann <simon.hausmann@nokia.com>2012-02-24 16:36:50 +0100
commitad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (patch)
treeb34b0daceb7c8e7fdde4b4ec43650ab7caadb0a9 /Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp
parent03e12282df9aa1e1fb05a8b90f1cfc2e08764cec (diff)
downloadqtwebkit-ad0d549d4cc13433f77c1ac8f0ab379c83d93f28.tar.gz
Imported WebKit commit bb52bf3c0119e8a128cd93afe5572413a8617de9 (http://svn.webkit.org/repository/webkit/trunk@108790)
Diffstat (limited to 'Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp')
-rw-r--r--Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp b/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp
index 18c506bcc..aacc27b6b 100644
--- a/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp
+++ b/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp
@@ -58,14 +58,12 @@ WK_EXPORT int WebProcessMainGtk(int argc, char* argv[])
WTF::initializeMainThread();
RunLoop::initializeMainRunLoop();
- SoupSession* session = WebCore::ResourceHandle::defaultSession();
+ int socket = atoi(argv[1]);
+ WebProcess::shared().initialize(socket, RunLoop::main());
- soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_SNIFFER);
- soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_DECODER);
+ SoupSession* session = WebCore::ResourceHandle::defaultSession();
soup_session_add_feature_by_type(session, WEB_TYPE_AUTH_DIALOG);
- int socket = atoi(argv[1]);
- WebProcess::shared().initialize(socket, RunLoop::main());
RunLoop::run();
return 0;