Diff
Modified: trunk/Source/WebKit2/ChangeLog (177720 => 177721)
--- trunk/Source/WebKit2/ChangeLog 2014-12-24 04:58:51 UTC (rev 177720)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-24 05:34:39 UTC (rev 177721)
@@ -1,3 +1,66 @@
+2014-12-23 ChangSeok Oh <[email protected]>
+
+ [GTK] Build fix after r177692
+ https://bugs.webkit.org/show_bug.cgi?id=139919
+
+ Reviewed by Gyuyoung Kim.
+
+ This change addresses build failures introduced after r177692.
+
+ * PlatformEfl.cmake: Renamed WebContextSoup to WebProcessPoolSoup.cpp
+ * PlatformGTK.cmake: ditto.
+ * UIProcess/API/gtk/PageClientImpl.cpp:
+ * UIProcess/API/gtk/WebKitDownloadClient.cpp:
+ * UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp:
+ (webkitFormSubmissionRequestCreate):
+ (webkit_form_submission_request_get_text_fields):
+ * UIProcess/API/gtk/WebKitFormSubmissionRequestPrivate.h:
+ * UIProcess/API/gtk/WebKitInjectedBundleClient.cpp:
+ (didReceiveWebViewMessageFromInjectedBundle):
+ (didReceiveMessageFromInjectedBundle):
+ * UIProcess/API/gtk/WebKitSecurityManager.cpp:
+ (registerSecurityPolicyForURIScheme):
+ * UIProcess/API/gtk/WebKitWebContext.cpp:
+ (webkitWebContextConstructed):
+ (webkit_web_context_prefetch_dns):
+ (webkitWebContextGetContext):
+ * UIProcess/API/gtk/WebKitWebContextPrivate.h:
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkit_web_view_get_snapshot):
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseCreate):
+ (webkitWebViewBaseCreateWebPage):
+ * UIProcess/API/gtk/WebKitWebViewBasePrivate.h:
+ * UIProcess/API/gtk/WebKitWindowProperties.cpp:
+ * UIProcess/gtk/WebInspectorProxyGtk.cpp:
+ (WebKit::WebInspectorProxy::platformCreateInspectorPage):
+ * UIProcess/gtk/WebProcessPoolGtk.cpp: Renamed from Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp.
+ (WebKit::initInspectorServer):
+ (WebKit::WebProcessPool::platformDefaultApplicationCacheDirectory):
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+ (WebKit::WebProcessPool::platformInvalidateContext):
+ (WebKit::WebProcessPool::platformDefaultWebSQLDatabaseDirectory):
+ (WebKit::WebProcessPool::platformDefaultIndexedDBDatabaseDirectory):
+ (WebKit::WebProcessPool::platformDefaultIconDatabasePath):
+ (WebKit::WebProcessPool::platformDefaultLocalStorageDirectory):
+ (WebKit::WebProcessPool::platformDefaultMediaKeysStorageDirectory):
+ (WebKit::WebProcessPool::platformDefaultDiskCacheDirectory):
+ (WebKit::WebProcessPool::platformDefaultCookieStorageDirectory):
+ (WebKit::WebProcessPool::setIgnoreTLSErrors):
+ * UIProcess/soup/WebProcessPoolSoup.cpp: Renamed from Source/WebKit2/UIProcess/soup/WebContextSoup.cpp.
+ (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+ * WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp:
+ (webkitWebExtensionDidReceiveMessage):
+ * WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
+ (didInitiateLoadForResource):
+ (willSendRequestForFrame):
+ (didReceiveResponseForResource):
+ (didReceiveContentLengthForResource):
+ (didFinishLoadForResource):
+ (didFailLoadForResource):
+ (webkitWebPageDidReceiveMessage):
+ * WebProcess/InjectedBundle/API/gtk/WebKitWebPagePrivate.h:
+
2014-12-23 Dan Bernstein <[email protected]>
iOS build fix
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (177720 => 177721)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2014-12-24 04:58:51 UTC (rev 177720)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2014-12-24 05:34:39 UTC (rev 177721)
@@ -174,8 +174,8 @@
UIProcess/efl/WebUIPopupMenuClient.cpp
UIProcess/efl/WebViewEfl.cpp
- UIProcess/soup/WebContextSoup.cpp
UIProcess/soup/WebCookieManagerProxySoup.cpp
+ UIProcess/soup/WebProcessPoolSoup.cpp
WebProcess/Cookies/soup/WebCookieManagerSoup.cpp
WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.cpp
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (177720 => 177721)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2014-12-24 04:58:51 UTC (rev 177720)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2014-12-24 05:34:39 UTC (rev 177721)
@@ -268,7 +268,6 @@
UIProcess/gtk/InputMethodFilter.cpp
UIProcess/gtk/RedirectedXCompositeWindow.cpp
UIProcess/gtk/TextCheckerGtk.cpp
- UIProcess/gtk/WebContextGtk.cpp
UIProcess/gtk/WebContextMenuProxyGtk.cpp
UIProcess/gtk/WebFullScreenClientGtk.cpp
UIProcess/gtk/WebInspectorClientGtk.cpp
@@ -276,11 +275,12 @@
UIProcess/gtk/WebPageProxyGtk.cpp
UIProcess/gtk/WebPopupMenuProxyGtk.cpp
UIProcess/gtk/WebPreferencesGtk.cpp
+ UIProcess/gtk/WebProcessPoolGtk.cpp
UIProcess/gtk/WebProcessProxyGtk.cpp
UIProcess/Network/soup/NetworkProcessProxySoup.cpp
- UIProcess/soup/WebContextSoup.cpp
UIProcess/soup/WebCookieManagerProxySoup.cpp
+ UIProcess/soup/WebProcessPoolSoup.cpp
WebProcess/Cookies/soup/WebCookieManagerSoup.cpp
WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.cpp
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (177720 => 177721)
--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2014-12-24 04:58:51 UTC (rev 177720)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2014-12-24 05:34:39 UTC (rev 177721)
@@ -32,12 +32,12 @@
#include "NativeWebKeyboardEvent.h"
#include "NativeWebMouseEvent.h"
#include "NotImplemented.h"
-#include "WebContext.h"
#include "WebContextMenuProxyGtk.h"
#include "WebEventFactory.h"
#include "WebKitWebViewBasePrivate.h"
#include "WebPageProxy.h"
#include "WebPopupMenuProxyGtk.h"
+#include "WebProcessPool.h"
#include <WebCore/Cursor.h>
#include <WebCore/EventNames.h>
#include <WebCore/GtkUtilities.h>
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp (177720 => 177721)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp 2014-12-24 04:58:51 UTC (rev 177720)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp 2014-12-24 05:34:39 UTC (rev 177721)
@@ -21,10 +21,10 @@
#include "WebKitDownloadClient.h"
#include "APIURLResponse.h"
-#include "WebContext.h"
#include "WebKitDownloadPrivate.h"
#include "WebKitURIResponsePrivate.h"
#include "WebKitWebContextPrivate.h"
+#include "WebProcessPool.h"
#include <WebKit/WKString.h>
#include <wtf/gobject/GRefPtr.h>
#include <wtf/text/CString.h>
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp (177720 => 177721)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp 2014-12-24 04:58:51 UTC (rev 177720)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp 2014-12-24 05:34:39 UTC (rev 177721)
@@ -20,8 +20,8 @@
#include "config.h"
#include "WebKitFormSubmissionRequest.h"
+#include "APIDictionary.h"
#include "APIString.h"
-#include "ImmutableDictionary.h"
#include "WebFormSubmissionListenerProxy.h"
#include "WebKitFormSubmissionRequestPrivate.h"
#include <wtf/gobject/GRefPtr.h>
@@ -45,7 +45,7 @@
*/
struct _WebKitFormSubmissionRequestPrivate {
- RefPtr<ImmutableDictionary> webValues;
+ RefPtr<API::Dictionary> webValues;
RefPtr<WebFormSubmissionListenerProxy> listener;
GRefPtr<GHashTable> values;
bool handledRequest;
@@ -70,7 +70,7 @@
objectClass->dispose = webkitFormSubmissionRequestDispose;
}
-WebKitFormSubmissionRequest* webkitFormSubmissionRequestCreate(ImmutableDictionary* values, WebFormSubmissionListenerProxy* listener)
+WebKitFormSubmissionRequest* webkitFormSubmissionRequestCreate(API::Dictionary* values, WebFormSubmissionListenerProxy* listener)
{
WebKitFormSubmissionRequest* request = WEBKIT_FORM_SUBMISSION_REQUEST(g_object_new(WEBKIT_TYPE_FORM_SUBMISSION_REQUEST, NULL));
request->priv->webValues = values;
@@ -100,9 +100,9 @@
request->priv->values = adoptGRef(g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free));
- const ImmutableDictionary::MapType& map = request->priv->webValues->map();
- ImmutableDictionary::MapType::const_iterator end = map.end();
- for (ImmutableDictionary::MapType::const_iterator it = map.begin(); it != end; ++it) {
+ const API::Dictionary::MapType& map = request->priv->webValues->map();
+ API::Dictionary::MapType::const_iterator end = map.end();
+ for (API::Dictionary::MapType::const_iterator it = map.begin(); it != end; ++it) {
API::String* value = static_cast<API::String*>(it->value.get());
g_hash_table_insert(request->priv->values.get(), g_strdup(it->key.utf8().data()), g_strdup(value->string().utf8().data()));
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequestPrivate.h (177720 => 177721)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequestPrivate.h 2014-12-24 04:58:51 UTC (rev 177720)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequestPrivate.h 2014-12-24 05:34:39 UTC (rev 177721)
@@ -23,6 +23,6 @@
#include "WebKitFormSubmissionRequest.h"
#include "WebKitPrivate.h"
-WebKitFormSubmissionRequest* webkitFormSubmissionRequestCreate(WebKit::ImmutableDictionary* values, WebKit::WebFormSubmissionListenerProxy*);
+WebKitFormSubmissionRequest* webkitFormSubmissionRequestCreate(API::Dictionary* values, WebKit::WebFormSubmissionListenerProxy*);
#endif // WebKitFormSubmissionRequestPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp (177720 => 177721)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp 2014-12-24 04:58:51 UTC (rev 177720)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp 2014-12-24 05:34:39 UTC (rev 177721)
@@ -32,7 +32,7 @@
using namespace WebKit;
using namespace WebCore;
-static void didReceiveWebViewMessageFromInjectedBundle(WebKitWebView* webView, const char* messageName, ImmutableDictionary& message)
+static void didReceiveWebViewMessageFromInjectedBundle(WebKitWebView* webView, const char* messageName, API::Dictionary& message)
{
if (g_str_equal(messageName, "DidInitiateLoadForResource")) {
WebFrameProxy* frame = static_cast<WebFrameProxy*>(message.get(String::fromUTF8("Frame")));
@@ -106,7 +106,7 @@
static void didReceiveMessageFromInjectedBundle(WKContextRef, WKStringRef messageName, WKTypeRef messageBody, const void* clientInfo)
{
ASSERT(WKGetTypeID(messageBody) == WKDictionaryGetTypeID());
- ImmutableDictionary& message = *toImpl(static_cast<WKDictionaryRef>(messageBody));
+ API::Dictionary& message = *toImpl(static_cast<WKDictionaryRef>(messageBody));
CString messageNameCString = toImpl(messageName)->string().utf8();
const char* messageNameUTF8 = messageNameCString.data();
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSecurityManager.cpp (177720 => 177721)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSecurityManager.cpp 2014-12-24 04:58:51 UTC (rev 177720)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSecurityManager.cpp 2014-12-24 05:34:39 UTC (rev 177721)
@@ -20,9 +20,9 @@
#include "config.h"
#include "WebKitSecurityManager.h"
-#include "WebContext.h"
#include "WebKitSecurityManagerPrivate.h"
#include "WebKitWebContextPrivate.h"
+#include "WebProcessPool.h"
#include <WebCore/SchemeRegistry.h>
using namespace WebKit;
@@ -69,7 +69,7 @@
static void registerSecurityPolicyForURIScheme(WebKitSecurityManager* manager, const char* scheme, SecurityPolicy policy)
{
String urlScheme = String::fromUTF8(scheme);
- WebContext* webContext = webkitWebContextGetContext(manager->priv->webContext);
+ WebProcessPool* webContext = webkitWebContextGetContext(manager->priv->webContext);
// We keep the WebCore::SchemeRegistry of the UI process in sync with the
// web process one, so that we can return the SecurityPolicy for
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (177720 => 177721)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2014-12-24 04:58:51 UTC (rev 177720)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2014-12-24 05:34:39 UTC (rev 177721)
@@ -153,7 +153,7 @@
typedef HashMap<uint64_t, GRefPtr<WebKitURISchemeRequest> > URISchemeRequestMap;
struct _WebKitWebContextPrivate {
- RefPtr<WebContext> context;
+ RefPtr<WebProcessPool> context;
bool clientsDetached;
GRefPtr<WebKitCookieManager> cookieManager;
@@ -257,15 +257,15 @@
G_OBJECT_CLASS(webkit_web_context_parent_class)->constructed(object);
GUniquePtr<char> bundleFilename(g_build_filename(injectedBundleDirectory(), "libwebkit2gtkinjectedbundle.so", nullptr));
- WebContextConfiguration webContextConfiguration;
+ WebProcessPoolConfiguration webContextConfiguration;
webContextConfiguration.injectedBundlePath = WebCore::filenameToString(bundleFilename.get());
- WebContext::applyPlatformSpecificConfigurationDefaults(webContextConfiguration);
+ WebProcessPool::applyPlatformSpecificConfigurationDefaults(webContextConfiguration);
WebKitWebContext* webContext = WEBKIT_WEB_CONTEXT(object);
WebKitWebContextPrivate* priv = webContext->priv;
if (!priv->localStorageDirectory.isNull())
webContextConfiguration.localStorageDirectory = WebCore::filenameToString(priv->localStorageDirectory.data());
- priv->context = WebContext::create(WTF::move(webContextConfiguration));
+ priv->context = WebProcessPool::create(WTF::move(webContextConfiguration));
priv->requestManager = priv->context->supplement<WebSoupCustomProtocolRequestManager>();
priv->context->setCacheModel(CacheModelPrimaryWebBrowser);
@@ -1003,9 +1003,9 @@
g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
g_return_if_fail(hostname);
- ImmutableDictionary::MapType message;
+ API::Dictionary::MapType message;
message.set(String::fromUTF8("Hostname"), API::String::create(String::fromUTF8(hostname)));
- context->priv->context->postMessageToInjectedBundle(String::fromUTF8("PrefetchDNS"), ImmutableDictionary::create(WTF::move(message)).get());
+ context->priv->context->postMessageToInjectedBundle(String::fromUTF8("PrefetchDNS"), API::Dictionary::create(WTF::move(message)).get());
}
/**
@@ -1124,7 +1124,7 @@
context->priv->webExtensionsInitializationUserData.get());
}
-WebContext* webkitWebContextGetContext(WebKitWebContext* context)
+WebProcessPool* webkitWebContextGetContext(WebKitWebContext* context)
{
g_assert(WEBKIT_IS_WEB_CONTEXT(context));
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h (177720 => 177721)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h 2014-12-24 04:58:51 UTC (rev 177720)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h 2014-12-24 05:34:39 UTC (rev 177721)
@@ -27,13 +27,13 @@
#define WebKitWebContextPrivate_h
#include "DownloadProxy.h"
-#include "WebContext.h"
#include "WebKitPrivate.h"
#include "WebKitUserContentManager.h"
#include "WebKitWebContext.h"
+#include "WebProcessPool.h"
#include "WebSoupCustomProtocolRequestManager.h"
-WebKit::WebContext* webkitWebContextGetContext(WebKitWebContext*);
+WebKit::WebProcessPool* webkitWebContextGetContext(WebKitWebContext*);
WebKitDownload* webkitWebContextGetOrCreateDownload(WebKit::DownloadProxy*);
WebKitDownload* webkitWebContextStartDownload(WebKitWebContext*, const char* uri, WebKit::WebPageProxy*);
void webkitWebContextRemoveDownload(WebKit::DownloadProxy*);
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (177720 => 177721)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-12-24 04:58:51 UTC (rev 177720)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-12-24 05:34:39 UTC (rev 177721)
@@ -3472,14 +3472,14 @@
{
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
- ImmutableDictionary::MapType message;
+ API::Dictionary::MapType message;
uint64_t callbackID = generateSnapshotCallbackID();
message.set(String::fromUTF8("SnapshotOptions"), API::UInt64::create(static_cast<uint64_t>(webKitSnapshotOptionsToSnapshotOptions(options))));
message.set(String::fromUTF8("SnapshotRegion"), API::UInt64::create(static_cast<uint64_t>(toSnapshotRegion(region))));
message.set(String::fromUTF8("CallbackID"), API::UInt64::create(callbackID));
webView->priv->snapshotResultsMap.set(callbackID, adoptGRef(g_task_new(webView, cancellable, callback, userData)));
- getPage(webView)->postMessageToInjectedBundle(String::fromUTF8("GetSnapshot"), ImmutableDictionary::create(WTF::move(message)).get());
+ getPage(webView)->postMessageToInjectedBundle(String::fromUTF8("GetSnapshot"), API::Dictionary::create(WTF::move(message)).get());
}
/**
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (177720 => 177721)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2014-12-24 04:58:51 UTC (rev 177720)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2014-12-24 05:34:39 UTC (rev 177721)
@@ -36,7 +36,6 @@
#include "PageClientImpl.h"
#include "RedirectedXCompositeWindow.h"
#include "ViewState.h"
-#include "WebContext.h"
#include "WebEventFactory.h"
#include "WebFullScreenClientGtk.h"
#include "WebInspectorProxy.h"
@@ -47,6 +46,7 @@
#include "WebPageGroup.h"
#include "WebPageProxy.h"
#include "WebPreferences.h"
+#include "WebProcessPool.h"
#include "WebUserContentControllerProxy.h"
#include <WebCore/CairoUtilities.h>
#include <WebCore/GUniquePtrGtk.h>
@@ -1082,7 +1082,7 @@
containerClass->forall = webkitWebViewBaseContainerForall;
}
-WebKitWebViewBase* webkitWebViewBaseCreate(WebContext* context, WebPreferences* preferences, WebPageGroup* pageGroup, WebUserContentControllerProxy* userContentController, WebPageProxy* relatedPage)
+WebKitWebViewBase* webkitWebViewBaseCreate(WebProcessPool* context, WebPreferences* preferences, WebPageGroup* pageGroup, WebUserContentControllerProxy* userContentController, WebPageProxy* relatedPage)
{
WebKitWebViewBase* webkitWebViewBase = WEBKIT_WEB_VIEW_BASE(g_object_new(WEBKIT_TYPE_WEB_VIEW_BASE, NULL));
webkitWebViewBaseCreateWebPage(webkitWebViewBase, context, preferences, pageGroup, userContentController, relatedPage);
@@ -1119,7 +1119,7 @@
}
#endif // HAVE(GTK_SCALE_FACTOR)
-void webkitWebViewBaseCreateWebPage(WebKitWebViewBase* webkitWebViewBase, WebContext* context, WebPreferences* preferences, WebPageGroup* pageGroup, WebUserContentControllerProxy* userContentController, WebPageProxy* relatedPage)
+void webkitWebViewBaseCreateWebPage(WebKitWebViewBase* webkitWebViewBase, WebProcessPool* context, WebPreferences* preferences, WebPageGroup* pageGroup, WebUserContentControllerProxy* userContentController, WebPageProxy* relatedPage)
{
WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h (177720 => 177721)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h 2014-12-24 04:58:51 UTC (rev 177720)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h 2014-12-24 05:34:39 UTC (rev 177721)
@@ -36,10 +36,10 @@
#include "WebKitWebViewBase.h"
#include "WebPageProxy.h"
-WebKitWebViewBase* webkitWebViewBaseCreate(WebKit::WebContext*, WebKit::WebPreferences*, WebKit::WebPageGroup*, WebKit::WebUserContentControllerProxy*, WebKit::WebPageProxy*);
+WebKitWebViewBase* webkitWebViewBaseCreate(WebKit::WebProcessPool*, WebKit::WebPreferences*, WebKit::WebPageGroup*, WebKit::WebUserContentControllerProxy*, WebKit::WebPageProxy*);
GtkIMContext* webkitWebViewBaseGetIMContext(WebKitWebViewBase*);
WebKit::WebPageProxy* webkitWebViewBaseGetPage(WebKitWebViewBase*);
-void webkitWebViewBaseCreateWebPage(WebKitWebViewBase*, WebKit::WebContext*, WebKit::WebPreferences*, WebKit::WebPageGroup*, WebKit::WebUserContentControllerProxy*, WebKit::WebPageProxy*);
+void webkitWebViewBaseCreateWebPage(WebKitWebViewBase*, WebKit::WebProcessPool*, WebKit::WebPreferences*, WebKit::WebPageGroup*, WebKit::WebUserContentControllerProxy*, WebKit::WebPageProxy*);
void webkitWebViewBaseSetTooltipText(WebKitWebViewBase*, const char*);
void webkitWebViewBaseSetTooltipArea(WebKitWebViewBase*, const WebCore::IntRect&);
void webkitWebViewBaseForwardNextKeyEvent(WebKitWebViewBase*);
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWindowProperties.cpp (177720 => 177721)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWindowProperties.cpp 2014-12-24 04:58:51 UTC (rev 177720)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWindowProperties.cpp 2014-12-24 05:34:39 UTC (rev 177721)
@@ -20,9 +20,9 @@
#include "config.h"
#include "WebKitWindowProperties.h"
+#include "APIDictionary.h"
#include "APINumber.h"
#include "APIURLRequest.h"
-#include "ImmutableDictionary.h"
#include "WebKitPrivate.h"
#include "WebKitWindowPropertiesPrivate.h"
#include <WebCore/IntRect.h>
Deleted: trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp (177720 => 177721)
--- trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2014-12-24 04:58:51 UTC (rev 177720)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2014-12-24 05:34:39 UTC (rev 177721)
@@ -1,169 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved.
- * Copyright (C) 2012 Samsung Electronics Ltd. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebContext.h"
-
-#include "Logging.h"
-#include "WebCookieManagerProxy.h"
-#include "WebInspectorServer.h"
-#include "WebProcessCreationParameters.h"
-#include "WebProcessMessages.h"
-#include "WebSoupCustomProtocolRequestManager.h"
-#include <WebCore/FileSystem.h>
-#include <WebCore/NotImplemented.h>
-#include <WebCore/SchemeRegistry.h>
-#include <wtf/gobject/GUniquePtr.h>
-#include <wtf/text/CString.h>
-
-#if ENABLE(NETWORK_PROCESS)
-#include "NetworkProcessMessages.h"
-#endif
-
-namespace WebKit {
-
-static void initInspectorServer()
-{
-#if ENABLE(INSPECTOR_SERVER)
- static bool initialized = false;
- if (initialized)
- return;
-
- initialized = true;
- String serverAddress(g_getenv("WEBKIT_INSPECTOR_SERVER"));
-
- if (!serverAddress.isNull()) {
- String bindAddress = "127.0.0.1";
- unsigned short port = 2999;
-
- Vector<String> result;
- serverAddress.split(':', result);
-
- if (result.size() == 2) {
- bindAddress = result[0];
- bool ok = false;
- port = result[1].toInt(&ok);
- if (!ok) {
- port = 2999;
- LOG_ERROR("Couldn't parse the port. Use 2999 instead.");
- }
- } else
- LOG_ERROR("Couldn't parse %s, wrong format? Use 127.0.0.1:2999 instead.", serverAddress.utf8().data());
-
- if (!WebInspectorServer::shared().listen(bindAddress, port))
- LOG_ERROR("Couldn't start listening on: IP address=%s, port=%d.", bindAddress.utf8().data(), port);
- return;
- }
-
- LOG(InspectorServer, "To start inspector server set WEBKIT_INSPECTOR_SERVER to 127.0.0.1:2999 for example.");
-#endif
-}
-
-WTF::String WebContext::platformDefaultApplicationCacheDirectory() const
-{
- GUniquePtr<gchar> cacheDirectory(g_build_filename(g_get_user_cache_dir(), "webkitgtk", "applications", nullptr));
- return WebCore::filenameToString(cacheDirectory.get());
-}
-
-void WebContext::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
-{
- initInspectorServer();
-
- if (!parameters.urlSchemesRegisteredAsLocal.contains("resource")) {
- WebCore::SchemeRegistry::registerURLSchemeAsLocal("resource");
- parameters.urlSchemesRegisteredAsLocal.append("resource");
- }
-
- if (!usesNetworkProcess()) {
- parameters.urlSchemesRegisteredForCustomProtocols = supplement<WebSoupCustomProtocolRequestManager>()->registeredSchemesForCustomProtocols();
-
- supplement<WebCookieManagerProxy>()->getCookiePersistentStorage(parameters.cookiePersistentStoragePath, parameters.cookiePersistentStorageType);
- parameters.cookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy;
-
- parameters.ignoreTLSErrors = m_ignoreTLSErrors;
- }
-}
-
-void WebContext::platformInvalidateContext()
-{
-}
-
-String WebContext::platformDefaultWebSQLDatabaseDirectory()
-{
- GUniquePtr<gchar> databaseDirectory(g_build_filename(g_get_user_data_dir(), "webkitgtk", "databases", nullptr));
- return WebCore::filenameToString(databaseDirectory.get());
-}
-
-String WebContext::platformDefaultIndexedDBDatabaseDirectory()
-{
- notImplemented();
- return String();
-}
-
-String WebContext::platformDefaultIconDatabasePath() const
-{
- GUniquePtr<gchar> databaseDirectory(g_build_filename(g_get_user_cache_dir(), "webkitgtk", "icondatabase", nullptr));
- return WebCore::filenameToString(databaseDirectory.get());
-}
-
-String WebContext::platformDefaultLocalStorageDirectory()
-{
- GUniquePtr<gchar> storageDirectory(g_build_filename(g_get_user_data_dir(), "webkitgtk", "localstorage", nullptr));
- return WebCore::filenameToString(storageDirectory.get());
-}
-
-String WebContext::platformDefaultMediaKeysStorageDirectory()
-{
- GUniquePtr<gchar> mediaKeysStorageDirectory(g_build_filename(g_get_user_data_dir(), "webkitgtk", "mediakeys", nullptr));
- return WebCore::filenameToString(mediaKeysStorageDirectory.get());
-}
-
-String WebContext::platformDefaultDiskCacheDirectory() const
-{
- GUniquePtr<char> diskCacheDirectory(g_build_filename(g_get_user_cache_dir(), g_get_prgname(), nullptr));
- return WebCore::filenameToString(diskCacheDirectory.get());
-}
-
-String WebContext::platformDefaultCookieStorageDirectory() const
-{
- notImplemented();
- return String();
-}
-
-void WebContext::setIgnoreTLSErrors(bool ignoreTLSErrors)
-{
- m_ignoreTLSErrors = ignoreTLSErrors;
-#if ENABLE(NETWORK_PROCESS)
- if (usesNetworkProcess() && networkProcess()) {
- networkProcess()->send(Messages::NetworkProcess::SetIgnoreTLSErrors(m_ignoreTLSErrors), 0);
- return;
- }
-#endif
- sendToAllProcesses(Messages::WebProcess::SetIgnoreTLSErrors(m_ignoreTLSErrors));
-}
-
-} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp (177720 => 177721)
--- trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp 2014-12-24 04:58:51 UTC (rev 177720)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp 2014-12-24 05:34:39 UTC (rev 177721)
@@ -62,7 +62,7 @@
{
ASSERT(m_page);
ASSERT(!m_inspectorView);
- m_inspectorView = GTK_WIDGET(webkitWebViewBaseCreate(&inspectorContext(), nullptr, inspectorPageGroup(), nullptr, nullptr));
+ m_inspectorView = GTK_WIDGET(webkitWebViewBaseCreate(&inspectorProcessPool(), nullptr, inspectorPageGroup(), nullptr, nullptr));
g_object_add_weak_pointer(G_OBJECT(m_inspectorView), reinterpret_cast<void**>(&m_inspectorView));
return webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(m_inspectorView));
}
Copied: trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp (from rev 177720, trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp) (0 => 177721)
--- trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp 2014-12-24 05:34:39 UTC (rev 177721)
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved.
+ * Copyright (C) 2012 Samsung Electronics Ltd. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebProcessPool.h"
+
+#include "Logging.h"
+#include "WebCookieManagerProxy.h"
+#include "WebInspectorServer.h"
+#include "WebProcessCreationParameters.h"
+#include "WebProcessMessages.h"
+#include "WebSoupCustomProtocolRequestManager.h"
+#include <WebCore/FileSystem.h>
+#include <WebCore/NotImplemented.h>
+#include <WebCore/SchemeRegistry.h>
+#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/text/CString.h>
+
+#if ENABLE(NETWORK_PROCESS)
+#include "NetworkProcessMessages.h"
+#endif
+
+namespace WebKit {
+
+static void initInspectorServer()
+{
+#if ENABLE(INSPECTOR_SERVER)
+ static bool initialized = false;
+ if (initialized)
+ return;
+
+ initialized = true;
+ String serverAddress(g_getenv("WEBKIT_INSPECTOR_SERVER"));
+
+ if (!serverAddress.isNull()) {
+ String bindAddress = "127.0.0.1";
+ unsigned short port = 2999;
+
+ Vector<String> result;
+ serverAddress.split(':', result);
+
+ if (result.size() == 2) {
+ bindAddress = result[0];
+ bool ok = false;
+ port = result[1].toInt(&ok);
+ if (!ok) {
+ port = 2999;
+ LOG_ERROR("Couldn't parse the port. Use 2999 instead.");
+ }
+ } else
+ LOG_ERROR("Couldn't parse %s, wrong format? Use 127.0.0.1:2999 instead.", serverAddress.utf8().data());
+
+ if (!WebInspectorServer::shared().listen(bindAddress, port))
+ LOG_ERROR("Couldn't start listening on: IP address=%s, port=%d.", bindAddress.utf8().data(), port);
+ return;
+ }
+
+ LOG(InspectorServer, "To start inspector server set WEBKIT_INSPECTOR_SERVER to 127.0.0.1:2999 for example.");
+#endif
+}
+
+WTF::String WebProcessPool::platformDefaultApplicationCacheDirectory() const
+{
+ GUniquePtr<gchar> cacheDirectory(g_build_filename(g_get_user_cache_dir(), "webkitgtk", "applications", nullptr));
+ return WebCore::filenameToString(cacheDirectory.get());
+}
+
+void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
+{
+ initInspectorServer();
+
+ if (!parameters.urlSchemesRegisteredAsLocal.contains("resource")) {
+ WebCore::SchemeRegistry::registerURLSchemeAsLocal("resource");
+ parameters.urlSchemesRegisteredAsLocal.append("resource");
+ }
+
+ if (!usesNetworkProcess()) {
+ parameters.urlSchemesRegisteredForCustomProtocols = supplement<WebSoupCustomProtocolRequestManager>()->registeredSchemesForCustomProtocols();
+
+ supplement<WebCookieManagerProxy>()->getCookiePersistentStorage(parameters.cookiePersistentStoragePath, parameters.cookiePersistentStorageType);
+ parameters.cookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy;
+
+ parameters.ignoreTLSErrors = m_ignoreTLSErrors;
+ }
+}
+
+void WebProcessPool::platformInvalidateContext()
+{
+}
+
+String WebProcessPool::platformDefaultWebSQLDatabaseDirectory()
+{
+ GUniquePtr<gchar> databaseDirectory(g_build_filename(g_get_user_data_dir(), "webkitgtk", "databases", nullptr));
+ return WebCore::filenameToString(databaseDirectory.get());
+}
+
+String WebProcessPool::platformDefaultIndexedDBDatabaseDirectory()
+{
+ notImplemented();
+ return String();
+}
+
+String WebProcessPool::platformDefaultIconDatabasePath() const
+{
+ GUniquePtr<gchar> databaseDirectory(g_build_filename(g_get_user_cache_dir(), "webkitgtk", "icondatabase", nullptr));
+ return WebCore::filenameToString(databaseDirectory.get());
+}
+
+String WebProcessPool::platformDefaultLocalStorageDirectory()
+{
+ GUniquePtr<gchar> storageDirectory(g_build_filename(g_get_user_data_dir(), "webkitgtk", "localstorage", nullptr));
+ return WebCore::filenameToString(storageDirectory.get());
+}
+
+String WebProcessPool::platformDefaultMediaKeysStorageDirectory()
+{
+ GUniquePtr<gchar> mediaKeysStorageDirectory(g_build_filename(g_get_user_data_dir(), "webkitgtk", "mediakeys", nullptr));
+ return WebCore::filenameToString(mediaKeysStorageDirectory.get());
+}
+
+String WebProcessPool::platformDefaultDiskCacheDirectory() const
+{
+ GUniquePtr<char> diskCacheDirectory(g_build_filename(g_get_user_cache_dir(), g_get_prgname(), nullptr));
+ return WebCore::filenameToString(diskCacheDirectory.get());
+}
+
+String WebProcessPool::platformDefaultCookieStorageDirectory() const
+{
+ notImplemented();
+ return String();
+}
+
+void WebProcessPool::setIgnoreTLSErrors(bool ignoreTLSErrors)
+{
+ m_ignoreTLSErrors = ignoreTLSErrors;
+#if ENABLE(NETWORK_PROCESS)
+ if (usesNetworkProcess() && networkProcess()) {
+ networkProcess()->send(Messages::NetworkProcess::SetIgnoreTLSErrors(m_ignoreTLSErrors), 0);
+ return;
+ }
+#endif
+ sendToAllProcesses(Messages::WebProcess::SetIgnoreTLSErrors(m_ignoreTLSErrors));
+}
+
+} // namespace WebKit
Deleted: trunk/Source/WebKit2/UIProcess/soup/WebContextSoup.cpp (177720 => 177721)
--- trunk/Source/WebKit2/UIProcess/soup/WebContextSoup.cpp 2014-12-24 04:58:51 UTC (rev 177720)
+++ trunk/Source/WebKit2/UIProcess/soup/WebContextSoup.cpp 2014-12-24 05:34:39 UTC (rev 177721)
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#if ENABLE(NETWORK_PROCESS)
-#include "WebProcessPool.h"
-
-#include "NetworkProcessCreationParameters.h"
-#include "WebCookieManagerProxy.h"
-#include "WebSoupCustomProtocolRequestManager.h"
-#include <WebCore/Language.h>
-
-namespace WebKit {
-
-void WebProcessPool::platformInitializeNetworkProcess(NetworkProcessCreationParameters& parameters)
-{
- supplement<WebCookieManagerProxy>()->getCookiePersistentStorage(parameters.cookiePersistentStoragePath, parameters.cookiePersistentStorageType);
- parameters.cookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy;
- parameters.ignoreTLSErrors = m_ignoreTLSErrors;
- parameters.languages = WebCore::userPreferredLanguages();
- parameters.urlSchemesRegisteredForCustomProtocols = supplement<WebSoupCustomProtocolRequestManager>()->registeredSchemesForCustomProtocols();
-}
-
-}
-
-#endif
Copied: trunk/Source/WebKit2/UIProcess/soup/WebProcessPoolSoup.cpp (from rev 177720, trunk/Source/WebKit2/UIProcess/soup/WebContextSoup.cpp) (0 => 177721)
--- trunk/Source/WebKit2/UIProcess/soup/WebProcessPoolSoup.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/soup/WebProcessPoolSoup.cpp 2014-12-24 05:34:39 UTC (rev 177721)
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2012 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#if ENABLE(NETWORK_PROCESS)
+#include "WebProcessPool.h"
+
+#include "NetworkProcessCreationParameters.h"
+#include "WebCookieManagerProxy.h"
+#include "WebSoupCustomProtocolRequestManager.h"
+#include <WebCore/Language.h>
+
+namespace WebKit {
+
+void WebProcessPool::platformInitializeNetworkProcess(NetworkProcessCreationParameters& parameters)
+{
+ supplement<WebCookieManagerProxy>()->getCookiePersistentStorage(parameters.cookiePersistentStoragePath, parameters.cookiePersistentStorageType);
+ parameters.cookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy;
+ parameters.ignoreTLSErrors = m_ignoreTLSErrors;
+ parameters.languages = WebCore::userPreferredLanguages();
+ parameters.urlSchemesRegisteredForCustomProtocols = supplement<WebSoupCustomProtocolRequestManager>()->registeredSchemesForCustomProtocols();
+}
+
+}
+
+#endif
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp (177720 => 177721)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp 2014-12-24 04:58:51 UTC (rev 177720)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp 2014-12-24 05:34:39 UTC (rev 177721)
@@ -20,8 +20,8 @@
#include "config.h"
#include "WebKitWebExtension.h"
+#include "APIDictionary.h"
#include "APIString.h"
-#include "ImmutableDictionary.h"
#include "WKBundleAPICast.h"
#include "WKBundlePage.h"
#include "WebKitPrivate.h"
@@ -81,7 +81,7 @@
extension->priv->pages.remove(page);
}
-static void webkitWebExtensionDidReceiveMessage(WebKitWebExtension*, const String& messageName, ImmutableDictionary& message)
+static void webkitWebExtensionDidReceiveMessage(WebKitWebExtension*, const String& messageName, API::Dictionary& message)
{
if (messageName == String::fromUTF8("PrefetchDNS")) {
API::String* hostname = static_cast<API::String*>(message.get(String::fromUTF8("Hostname")));
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp (177720 => 177721)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2014-12-24 04:58:51 UTC (rev 177720)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2014-12-24 05:34:39 UTC (rev 177721)
@@ -21,8 +21,8 @@
#include "WebKitWebPage.h"
#include "APIArray.h"
+#include "APIDictionary.h"
#include "ImageOptions.h"
-#include "ImmutableDictionary.h"
#include "InjectedBundle.h"
#include "WKBundleAPICast.h"
#include "WKBundleFrame.h"
@@ -158,12 +158,12 @@
static void didInitiateLoadForResource(WKBundlePageRef page, WKBundleFrameRef frame, uint64_t identifier, WKURLRequestRef request, bool /* pageLoadIsProvisional */, const void*)
{
- ImmutableDictionary::MapType message;
+ API::Dictionary::MapType message;
message.set(String::fromUTF8("Page"), toImpl(page));
message.set(String::fromUTF8("Frame"), toImpl(frame));
message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
message.set(String::fromUTF8("Request"), toImpl(request));
- WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidInitiateLoadForResource"), ImmutableDictionary::create(WTF::move(message)).get());
+ WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidInitiateLoadForResource"), API::Dictionary::create(WTF::move(message)).get());
}
static WKURLRequestRef willSendRequestForFrame(WKBundlePageRef page, WKBundleFrameRef, uint64_t identifier, WKURLRequestRef wkRequest, WKURLResponseRef wkRedirectResponse, const void* clientInfo)
@@ -182,50 +182,50 @@
resourceRequest.setInitiatingPageID(toImpl(page)->pageID());
RefPtr<API::URLRequest> newRequest = API::URLRequest::create(resourceRequest);
- ImmutableDictionary::MapType message;
+ API::Dictionary::MapType message;
message.set(String::fromUTF8("Page"), toImpl(page));
message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
message.set(String::fromUTF8("Request"), newRequest.get());
if (!redirectResourceResponse.isNull())
message.set(String::fromUTF8("RedirectResponse"), toImpl(wkRedirectResponse));
- WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidSendRequestForResource"), ImmutableDictionary::create(WTF::move(message)).get());
+ WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidSendRequestForResource"), API::Dictionary::create(WTF::move(message)).get());
return toAPI(newRequest.release().leakRef());
}
static void didReceiveResponseForResource(WKBundlePageRef page, WKBundleFrameRef, uint64_t identifier, WKURLResponseRef response, const void*)
{
- ImmutableDictionary::MapType message;
+ API::Dictionary::MapType message;
message.set(String::fromUTF8("Page"), toImpl(page));
message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
message.set(String::fromUTF8("Response"), toImpl(response));
- WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidReceiveResponseForResource"), ImmutableDictionary::create(WTF::move(message)).get());
+ WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidReceiveResponseForResource"), API::Dictionary::create(WTF::move(message)).get());
}
static void didReceiveContentLengthForResource(WKBundlePageRef page, WKBundleFrameRef, uint64_t identifier, uint64_t length, const void*)
{
- ImmutableDictionary::MapType message;
+ API::Dictionary::MapType message;
message.set(String::fromUTF8("Page"), toImpl(page));
message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
message.set(String::fromUTF8("ContentLength"), API::UInt64::create(length));
- WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidReceiveContentLengthForResource"), ImmutableDictionary::create(WTF::move(message)).get());
+ WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidReceiveContentLengthForResource"), API::Dictionary::create(WTF::move(message)).get());
}
static void didFinishLoadForResource(WKBundlePageRef page, WKBundleFrameRef, uint64_t identifier, const void*)
{
- ImmutableDictionary::MapType message;
+ API::Dictionary::MapType message;
message.set(String::fromUTF8("Page"), toImpl(page));
message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
- WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidFinishLoadForResource"), ImmutableDictionary::create(WTF::move(message)).get());
+ WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidFinishLoadForResource"), API::Dictionary::create(WTF::move(message)).get());
}
static void didFailLoadForResource(WKBundlePageRef page, WKBundleFrameRef, uint64_t identifier, WKErrorRef error, const void*)
{
- ImmutableDictionary::MapType message;
+ API::Dictionary::MapType message;
message.set(String::fromUTF8("Page"), toImpl(page));
message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
message.set(String::fromUTF8("Error"), toImpl(error));
- WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidFailLoadForResource"), ImmutableDictionary::create(WTF::move(message)).get());
+ WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidFailLoadForResource"), API::Dictionary::create(WTF::move(message)).get());
}
static void getContextMenuFromDefaultMenu(WKBundlePageRef, WKBundleHitTestResultRef wkHitTestResult, WKArrayRef wkDefaultMenu, WKArrayRef* wkNewMenu, WKTypeRef* wkUserData, const void* clientInfo)
@@ -448,7 +448,7 @@
return page;
}
-void webkitWebPageDidReceiveMessage(WebKitWebPage* page, const String& messageName, ImmutableDictionary& message)
+void webkitWebPageDidReceiveMessage(WebKitWebPage* page, const String& messageName, API::Dictionary& message)
{
if (messageName == String("GetSnapshot")) {
SnapshotOptions snapshotOptions = static_cast<SnapshotOptions>(static_cast<API::UInt64*>(message.get("SnapshotOptions"))->value());
@@ -473,11 +473,11 @@
snapshotImage = webPage->scaledSnapshotWithOptions(snapshotRect, 1, snapshotOptions | SnapshotOptionsShareable);
}
- ImmutableDictionary::MapType messageReply;
+ API::Dictionary::MapType messageReply;
messageReply.set("Page", webPage);
messageReply.set("CallbackID", API::UInt64::create(callbackID));
messageReply.set("Snapshot", snapshotImage);
- WebProcess::shared().injectedBundle()->postMessage("WebPage.DidGetSnapshot", ImmutableDictionary::create(WTF::move(messageReply)).get());
+ WebProcess::shared().injectedBundle()->postMessage("WebPage.DidGetSnapshot", API::Dictionary::create(WTF::move(messageReply)).get());
} else
ASSERT_NOT_REACHED();
}
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPagePrivate.h (177720 => 177721)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPagePrivate.h 2014-12-24 04:58:51 UTC (rev 177720)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPagePrivate.h 2014-12-24 05:34:39 UTC (rev 177721)
@@ -20,11 +20,11 @@
#ifndef WebKitWebPagePrivate_h
#define WebKitWebPagePrivate_h
-#include "ImmutableDictionary.h"
+#include "APIDictionary.h"
#include "WebKitWebPage.h"
#include "WebPage.h"
WebKitWebPage* webkitWebPageCreate(WebKit::WebPage*);
-void webkitWebPageDidReceiveMessage(WebKitWebPage*, const String& messageName, WebKit::ImmutableDictionary& message);
+void webkitWebPageDidReceiveMessage(WebKitWebPage*, const String& messageName, API::Dictionary& message);
#endif // WebKitWebPagePrivate_h
