Title: [160358] trunk/Source/WebKit2
- Revision
- 160358
- Author
- be...@igalia.com
- Date
- 2013-12-10 05:06:55 -0800 (Tue, 10 Dec 2013)
Log Message
[WK2] [GTK] Enable the network process in the WebContext
https://bugs.webkit.org/show_bug.cgi?id=125494
Reviewed by Carlos Garcia Campos.
This should be initialized using the setUsesNetworkProcess() API.
* UIProcess/API/gtk/WebKitWebContext.cpp:
(createDefaultWebContext):
* UIProcess/gtk/WebContextGtk.cpp:
(WebKit::WebContext::platformInitializeWebProcess):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (160357 => 160358)
--- trunk/Source/WebKit2/ChangeLog 2013-12-10 12:55:15 UTC (rev 160357)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-10 13:06:55 UTC (rev 160358)
@@ -1,3 +1,17 @@
+2013-12-10 Alberto Garcia <be...@igalia.com>
+
+ [WK2] [GTK] Enable the network process in the WebContext
+ https://bugs.webkit.org/show_bug.cgi?id=125494
+
+ Reviewed by Carlos Garcia Campos.
+
+ This should be initialized using the setUsesNetworkProcess() API.
+
+ * UIProcess/API/gtk/WebKitWebContext.cpp:
+ (createDefaultWebContext):
+ * UIProcess/gtk/WebContextGtk.cpp:
+ (WebKit::WebContext::platformInitializeWebProcess):
+
2013-12-10 Brian Holt <brian.h...@samsung.com>
[WK2][SOUP] initialise the Network Process with ignoreTLSErrors
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (160357 => 160358)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2013-12-10 12:55:15 UTC (rev 160357)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2013-12-10 13:06:55 UTC (rev 160358)
@@ -199,6 +199,9 @@
priv->context = WebContext::create(WebCore::filenameToString(injectedBundleFilename().data()));
priv->requestManager = webContext->priv->context->supplement<WebSoupRequestManagerProxy>();
priv->context->setCacheModel(CacheModelPrimaryWebBrowser);
+#if ENABLE(NETWORK_PROCESS)
+ priv->context->setUsesNetworkProcess(true);
+#endif
priv->tlsErrorsPolicy = WEBKIT_TLS_ERRORS_POLICY_IGNORE;
attachInjectedBundleClientToContext(webContext.get());
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp (160357 => 160358)
--- trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2013-12-10 12:55:15 UTC (rev 160357)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2013-12-10 13:06:55 UTC (rev 160358)
@@ -98,9 +98,7 @@
supplement<WebCookieManagerProxy>()->getCookiePersistentStorage(parameters.cookiePersistentStoragePath, parameters.cookiePersistentStorageType);
parameters.cookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy;
parameters.shouldTrackVisitedLinks = true;
-#if ENABLE(NETWORK_PROCESS)
- parameters.usesNetworkProcess = true;
-#else
+#if !ENABLE(NETWORK_PROCESS)
parameters.ignoreTLSErrors = m_ignoreTLSErrors;
#endif
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
