<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[194532] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/194532">194532</a></dd>
<dt>Author</dt> <dd>mcatanzaro@igalia.com</dd>
<dt>Date</dt> <dd>2016-01-04 08:13:38 -0800 (Mon, 04 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Rename _WebKitWebContextPrivate.context to _WebKitWebContextPrivate.processPool
https://bugs.webkit.org/show_bug.cgi?id=152672
Reviewed by Carlos Garcia Campos.
* UIProcess/API/gtk/WebKitDownloadClient.cpp:
(attachDownloadClientToContext):
* UIProcess/API/gtk/WebKitInjectedBundleClient.cpp:
(attachInjectedBundleClientToContext):
* UIProcess/API/gtk/WebKitSecurityManager.cpp:
(registerSecurityPolicyForURIScheme):
* UIProcess/API/gtk/WebKitWebContext.cpp:
(webkitWebContextConstructed):
(webkitWebContextDispose):
(webkit_web_context_set_cache_model):
(webkit_web_context_get_cache_model):
(webkit_web_context_clear_cache):
(webkit_web_context_get_cookie_manager):
(ensureFaviconDatabase):
(webkit_web_context_set_favicon_database_directory):
(webkit_web_context_set_additional_plugins_directory):
(webkitWebContextGetPluginThread):
(webkit_web_context_set_tls_errors_policy):
(webkit_web_context_set_disk_cache_directory):
(webkit_web_context_prefetch_dns):
(webkit_web_context_allow_tls_certificate_for_host):
(webkit_web_context_set_process_model):
(webkit_web_context_set_web_process_count_limit):
(webkitWebContextStartDownload):
(webkitWebContextGetProcessPool):
(webkitWebContextCreatePageForWebView):
(webkitWebContextGetContext): Deleted.
* UIProcess/API/gtk/WebKitWebContextPrivate.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitDownloadClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitInjectedBundleClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitSecurityManagercpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSecurityManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextPrivateh">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (194531 => 194532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-01-04 16:09:15 UTC (rev 194531)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-04 16:13:38 UTC (rev 194532)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2016-01-04 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [GTK] Rename _WebKitWebContextPrivate.context to _WebKitWebContextPrivate.processPool
+ https://bugs.webkit.org/show_bug.cgi?id=152672
+
+ Reviewed by Carlos Garcia Campos.
+
+ * UIProcess/API/gtk/WebKitDownloadClient.cpp:
+ (attachDownloadClientToContext):
+ * UIProcess/API/gtk/WebKitInjectedBundleClient.cpp:
+ (attachInjectedBundleClientToContext):
+ * UIProcess/API/gtk/WebKitSecurityManager.cpp:
+ (registerSecurityPolicyForURIScheme):
+ * UIProcess/API/gtk/WebKitWebContext.cpp:
+ (webkitWebContextConstructed):
+ (webkitWebContextDispose):
+ (webkit_web_context_set_cache_model):
+ (webkit_web_context_get_cache_model):
+ (webkit_web_context_clear_cache):
+ (webkit_web_context_get_cookie_manager):
+ (ensureFaviconDatabase):
+ (webkit_web_context_set_favicon_database_directory):
+ (webkit_web_context_set_additional_plugins_directory):
+ (webkitWebContextGetPluginThread):
+ (webkit_web_context_set_tls_errors_policy):
+ (webkit_web_context_set_disk_cache_directory):
+ (webkit_web_context_prefetch_dns):
+ (webkit_web_context_allow_tls_certificate_for_host):
+ (webkit_web_context_set_process_model):
+ (webkit_web_context_set_web_process_count_limit):
+ (webkitWebContextStartDownload):
+ (webkitWebContextGetProcessPool):
+ (webkitWebContextCreatePageForWebView):
+ (webkitWebContextGetContext): Deleted.
+ * UIProcess/API/gtk/WebKitWebContextPrivate.h:
+
</ins><span class="cx"> 2016-01-03 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename scrollPosition(Scrollbar*) to scrollOffset(ScrollbarOrientation)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitDownloadClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp (194531 => 194532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp 2016-01-04 16:09:15 UTC (rev 194531)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp 2016-01-04 16:13:38 UTC (rev 194532)
</span><span class="lines">@@ -111,6 +111,6 @@
</span><span class="cx"> didCancel,
</span><span class="cx"> 0, // processDidCrash
</span><span class="cx"> };
</span><del>- WKContextSetDownloadClient(toAPI(webkitWebContextGetContext(webContext)), &wkDownloadClient.base);
</del><ins>+ WKContextSetDownloadClient(toAPI(webkitWebContextGetProcessPool(webContext)), &wkDownloadClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitInjectedBundleClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp (194531 => 194532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp 2016-01-04 16:09:15 UTC (rev 194531)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp 2016-01-04 16:13:38 UTC (rev 194532)
</span><span class="lines">@@ -140,5 +140,5 @@
</span><span class="cx"> 0, // didReceiveSynchronousMessageFromInjectedBundle
</span><span class="cx"> getInjectedBundleInitializationUserData
</span><span class="cx"> };
</span><del>- WKContextSetInjectedBundleClient(toAPI(webkitWebContextGetContext(webContext)), &wkInjectedBundleClient.base);
</del><ins>+ WKContextSetInjectedBundleClient(toAPI(webkitWebContextGetProcessPool(webContext)), &wkInjectedBundleClient.base);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitSecurityManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSecurityManager.cpp (194531 => 194532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSecurityManager.cpp 2016-01-04 16:09:15 UTC (rev 194531)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSecurityManager.cpp 2016-01-04 16:13:38 UTC (rev 194532)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> static void registerSecurityPolicyForURIScheme(WebKitSecurityManager* manager, const char* scheme, SecurityPolicy policy)
</span><span class="cx"> {
</span><span class="cx"> String urlScheme = String::fromUTF8(scheme);
</span><del>- WebProcessPool* webContext = webkitWebContextGetContext(manager->priv->webContext);
</del><ins>+ WebProcessPool* processPool = webkitWebContextGetProcessPool(manager->priv->webContext);
</ins><span class="cx">
</span><span class="cx"> // We keep the WebCore::SchemeRegistry of the UI process in sync with the
</span><span class="cx"> // web process one, so that we can return the SecurityPolicy for
</span><span class="lines">@@ -77,27 +77,27 @@
</span><span class="cx"> switch (policy) {
</span><span class="cx"> case SecurityPolicyLocal:
</span><span class="cx"> WebCore::SchemeRegistry::registerURLSchemeAsLocal(urlScheme);
</span><del>- webContext->registerURLSchemeAsLocal(urlScheme);
</del><ins>+ processPool->registerURLSchemeAsLocal(urlScheme);
</ins><span class="cx"> break;
</span><span class="cx"> case SecurityPolicyNoAccess:
</span><span class="cx"> WebCore::SchemeRegistry::registerURLSchemeAsNoAccess(urlScheme);
</span><del>- webContext->registerURLSchemeAsNoAccess(urlScheme);
</del><ins>+ processPool->registerURLSchemeAsNoAccess(urlScheme);
</ins><span class="cx"> break;
</span><span class="cx"> case SecurityPolicyDisplayIsolated:
</span><span class="cx"> WebCore::SchemeRegistry::registerURLSchemeAsDisplayIsolated(urlScheme);
</span><del>- webContext->registerURLSchemeAsDisplayIsolated(urlScheme);
</del><ins>+ processPool->registerURLSchemeAsDisplayIsolated(urlScheme);
</ins><span class="cx"> break;
</span><span class="cx"> case SecurityPolicySecure:
</span><span class="cx"> WebCore::SchemeRegistry::registerURLSchemeAsSecure(urlScheme);
</span><del>- webContext->registerURLSchemeAsSecure(urlScheme);
</del><ins>+ processPool->registerURLSchemeAsSecure(urlScheme);
</ins><span class="cx"> break;
</span><span class="cx"> case SecurityPolicyCORSEnabled:
</span><span class="cx"> WebCore::SchemeRegistry::registerURLSchemeAsCORSEnabled(urlScheme);
</span><del>- webContext->registerURLSchemeAsCORSEnabled(urlScheme);
</del><ins>+ processPool->registerURLSchemeAsCORSEnabled(urlScheme);
</ins><span class="cx"> break;
</span><span class="cx"> case SecurityPolicyEmptyDocument:
</span><span class="cx"> WebCore::SchemeRegistry::registerURLSchemeAsEmptyDocument(urlScheme);
</span><del>- webContext->registerURLSchemeAsEmptyDocument(urlScheme);
</del><ins>+ processPool->registerURLSchemeAsEmptyDocument(urlScheme);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (194531 => 194532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2016-01-04 16:09:15 UTC (rev 194531)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2016-01-04 16:13:38 UTC (rev 194532)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> typedef HashMap<uint64_t, GRefPtr<WebKitURISchemeRequest> > URISchemeRequestMap;
</span><span class="cx">
</span><span class="cx"> struct _WebKitWebContextPrivate {
</span><del>- RefPtr<WebProcessPool> context;
</del><ins>+ RefPtr<WebProcessPool> processPool;
</ins><span class="cx"> bool clientsDetached;
</span><span class="cx">
</span><span class="cx"> GRefPtr<WebKitCookieManager> cookieManager;
</span><span class="lines">@@ -273,28 +273,28 @@
</span><span class="cx"> } else if (!priv->localStorageDirectory.isNull())
</span><span class="cx"> configuration.setLocalStorageDirectory(WebCore::filenameToString(priv->localStorageDirectory.data()));
</span><span class="cx">
</span><del>- priv->context = WebProcessPool::create(configuration);
</del><ins>+ priv->processPool = WebProcessPool::create(configuration);
</ins><span class="cx">
</span><span class="cx"> if (!priv->websiteDataManager)
</span><span class="cx"> priv->websiteDataManager = webkitWebsiteDataManagerCreate(websiteDataStoreConfigurationForWebProcessPoolConfiguration(configuration));
</span><span class="cx">
</span><del>- priv->requestManager = priv->context->supplement<WebSoupCustomProtocolRequestManager>();
</del><ins>+ priv->requestManager = priv->processPool->supplement<WebSoupCustomProtocolRequestManager>();
</ins><span class="cx">
</span><span class="cx"> priv->tlsErrorsPolicy = WEBKIT_TLS_ERRORS_POLICY_FAIL;
</span><del>- priv->context->setIgnoreTLSErrors(false);
</del><ins>+ priv->processPool->setIgnoreTLSErrors(false);
</ins><span class="cx">
</span><span class="cx"> attachInjectedBundleClientToContext(webContext);
</span><span class="cx"> attachDownloadClientToContext(webContext);
</span><span class="cx"> attachRequestManagerClientToContext(webContext);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(GEOLOCATION)
</span><del>- priv->geolocationProvider = WebKitGeolocationProvider::create(priv->context->supplement<WebGeolocationManagerProxy>());
</del><ins>+ priv->geolocationProvider = WebKitGeolocationProvider::create(priv->processPool->supplement<WebGeolocationManagerProxy>());
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(BATTERY_STATUS)
</span><del>- priv->batteryProvider = WebKitBatteryProvider::create(priv->context->supplement<WebBatteryManagerProxy>());
</del><ins>+ priv->batteryProvider = WebKitBatteryProvider::create(priv->processPool->supplement<WebBatteryManagerProxy>());
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(NOTIFICATIONS)
</span><del>- priv->notificationProvider = WebKitNotificationProvider::create(priv->context->supplement<WebNotificationManagerProxy>());
</del><ins>+ priv->notificationProvider = WebKitNotificationProvider::create(priv->processPool->supplement<WebNotificationManagerProxy>());
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -303,8 +303,8 @@
</span><span class="cx"> WebKitWebContextPrivate* priv = WEBKIT_WEB_CONTEXT(object)->priv;
</span><span class="cx"> if (!priv->clientsDetached) {
</span><span class="cx"> priv->clientsDetached = true;
</span><del>- priv->context->initializeInjectedBundleClient(nullptr);
- priv->context->setDownloadClient(nullptr);
</del><ins>+ priv->processPool->initializeInjectedBundleClient(nullptr);
+ priv->processPool->setDownloadClient(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> G_OBJECT_CLASS(webkit_web_context_parent_class)->dispose(object);
</span><span class="lines">@@ -507,8 +507,8 @@
</span><span class="cx"> g_assert_not_reached();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (cacheModel != context->priv->context->cacheModel())
- context->priv->context->setCacheModel(cacheModel);
</del><ins>+ if (cacheModel != context->priv->processPool->cacheModel())
+ context->priv->processPool->setCacheModel(cacheModel);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -525,7 +525,7 @@
</span><span class="cx"> {
</span><span class="cx"> g_return_val_if_fail(WEBKIT_IS_WEB_CONTEXT(context), WEBKIT_CACHE_MODEL_WEB_BROWSER);
</span><span class="cx">
</span><del>- switch (context->priv->context->cacheModel()) {
</del><ins>+ switch (context->priv->processPool->cacheModel()) {
</ins><span class="cx"> case CacheModelDocumentViewer:
</span><span class="cx"> return WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER;
</span><span class="cx"> case CacheModelPrimaryWebBrowser:
</span><span class="lines">@@ -551,7 +551,7 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
</span><span class="cx">
</span><span class="cx"> // FIXME: https://bugs.webkit.org/show_bug.cgi?id=146041
</span><del>- // context->priv->context->supplement<WebResourceCacheManagerProxy>()->clearCacheForAllOrigins(AllResourceCaches);
</del><ins>+ // context->priv->processPool->supplement<WebResourceCacheManagerProxy>()->clearCacheForAllOrigins(AllResourceCaches);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> typedef HashMap<DownloadProxy*, GRefPtr<WebKitDownload> > DownloadsMap;
</span><span class="lines">@@ -597,7 +597,7 @@
</span><span class="cx">
</span><span class="cx"> WebKitWebContextPrivate* priv = context->priv;
</span><span class="cx"> if (!priv->cookieManager)
</span><del>- priv->cookieManager = adoptGRef(webkitCookieManagerCreate(priv->context->supplement<WebCookieManagerProxy>()));
</del><ins>+ priv->cookieManager = adoptGRef(webkitCookieManagerCreate(priv->processPool->supplement<WebCookieManagerProxy>()));
</ins><span class="cx">
</span><span class="cx"> return priv->cookieManager.get();
</span><span class="cx"> }
</span><span class="lines">@@ -608,7 +608,7 @@
</span><span class="cx"> if (priv->faviconDatabase)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- priv->faviconDatabase = adoptGRef(webkitFaviconDatabaseCreate(priv->context->iconDatabase()));
</del><ins>+ priv->faviconDatabase = adoptGRef(webkitFaviconDatabaseCreate(priv->processPool->iconDatabase()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -631,7 +631,7 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
</span><span class="cx">
</span><span class="cx"> WebKitWebContextPrivate* priv = context->priv;
</span><del>- WebIconDatabase* iconDatabase = priv->context->iconDatabase();
</del><ins>+ WebIconDatabase* iconDatabase = priv->processPool->iconDatabase();
</ins><span class="cx"> if (iconDatabase->isOpen())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -640,7 +640,7 @@
</span><span class="cx"> // Use default if 0 is passed as parameter.
</span><span class="cx"> String directoryPath = WebCore::filenameToString(path);
</span><span class="cx"> priv->faviconDatabaseDirectory = directoryPath.isEmpty()
</span><del>- ? priv->context->iconDatabasePath().utf8()
</del><ins>+ ? priv->processPool->iconDatabasePath().utf8()
</ins><span class="cx"> : directoryPath.utf8();
</span><span class="cx">
</span><span class="cx"> // Build the full path to the icon database file on disk.
</span><span class="lines">@@ -648,7 +648,7 @@
</span><span class="cx"> WebCore::IconDatabase::defaultDatabaseFilename().utf8().data(), nullptr));
</span><span class="cx">
</span><span class="cx"> // Setting the path will cause the icon database to be opened.
</span><del>- priv->context->setIconDatabasePath(WebCore::filenameToString(faviconDatabasePath.get()));
</del><ins>+ priv->processPool->setIconDatabasePath(WebCore::filenameToString(faviconDatabasePath.get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -729,7 +729,7 @@
</span><span class="cx"> g_return_if_fail(directory);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- context->priv->context->setAdditionalPluginsDirectory(WebCore::filenameToString(directory));
</del><ins>+ context->priv->processPool->setAdditionalPluginsDirectory(WebCore::filenameToString(directory));
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -742,7 +742,7 @@
</span><span class="cx"> {
</span><span class="cx"> GList* returnValue = 0;
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- Vector<PluginModuleInfo> plugins = WEBKIT_WEB_CONTEXT(object)->priv->context->pluginInfoStore().plugins();
</del><ins>+ Vector<PluginModuleInfo> plugins = WEBKIT_WEB_CONTEXT(object)->priv->processPool->pluginInfoStore().plugins();
</ins><span class="cx"> for (size_t i = 0; i < plugins.size(); ++i)
</span><span class="cx"> returnValue = g_list_prepend(returnValue, webkitPluginCreate(plugins[i]));
</span><span class="cx"> #endif
</span><span class="lines">@@ -990,8 +990,8 @@
</span><span class="cx">
</span><span class="cx"> context->priv->tlsErrorsPolicy = policy;
</span><span class="cx"> bool ignoreTLSErrors = policy == WEBKIT_TLS_ERRORS_POLICY_IGNORE;
</span><del>- if (context->priv->context->ignoreTLSErrors() != ignoreTLSErrors)
- context->priv->context->setIgnoreTLSErrors(ignoreTLSErrors);
</del><ins>+ if (context->priv->processPool->ignoreTLSErrors() != ignoreTLSErrors)
+ context->priv->processPool->setIgnoreTLSErrors(ignoreTLSErrors);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1071,7 +1071,7 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
</span><span class="cx"> g_return_if_fail(directory);
</span><span class="cx">
</span><del>- context->priv->context->configuration().setDiskCacheDirectory(WebCore::pathByAppendingComponent(WebCore::filenameToString(directory), networkCacheSubdirectory));
</del><ins>+ context->priv->processPool->configuration().setDiskCacheDirectory(WebCore::pathByAppendingComponent(WebCore::filenameToString(directory), networkCacheSubdirectory));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1089,7 +1089,7 @@
</span><span class="cx">
</span><span class="cx"> API::Dictionary::MapType message;
</span><span class="cx"> message.set(String::fromUTF8("Hostname"), API::String::create(String::fromUTF8(hostname)));
</span><del>- context->priv->context->postMessageToInjectedBundle(String::fromUTF8("PrefetchDNS"), API::Dictionary::create(WTFMove(message)).ptr());
</del><ins>+ context->priv->processPool->postMessageToInjectedBundle(String::fromUTF8("PrefetchDNS"), API::Dictionary::create(WTFMove(message)).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1109,7 +1109,7 @@
</span><span class="cx"> g_return_if_fail(host);
</span><span class="cx">
</span><span class="cx"> RefPtr<WebCertificateInfo> webCertificateInfo = WebCertificateInfo::create(WebCore::CertificateInfo(certificate, static_cast<GTlsCertificateFlags>(0)));
</span><del>- context->priv->context->allowSpecificHTTPSCertificateForHost(webCertificateInfo.get(), String::fromUTF8(host));
</del><ins>+ context->priv->processPool->allowSpecificHTTPSCertificateForHost(webCertificateInfo.get(), String::fromUTF8(host));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1149,10 +1149,10 @@
</span><span class="cx"> context->priv->processModel = processModel;
</span><span class="cx"> switch (context->priv->processModel) {
</span><span class="cx"> case WEBKIT_PROCESS_MODEL_SHARED_SECONDARY_PROCESS:
</span><del>- context->priv->context->setMaximumNumberOfProcesses(1);
</del><ins>+ context->priv->processPool->setMaximumNumberOfProcesses(1);
</ins><span class="cx"> break;
</span><span class="cx"> case WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES:
</span><del>- context->priv->context->setMaximumNumberOfProcesses(context->priv->processCountLimit);
</del><ins>+ context->priv->processPool->setMaximumNumberOfProcesses(context->priv->processCountLimit);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1198,7 +1198,7 @@
</span><span class="cx">
</span><span class="cx"> context->priv->processCountLimit = limit;
</span><span class="cx"> if (context->priv->processModel != WEBKIT_PROCESS_MODEL_SHARED_SECONDARY_PROCESS)
</span><del>- context->priv->context->setMaximumNumberOfProcesses(limit);
</del><ins>+ context->priv->processPool->setMaximumNumberOfProcesses(limit);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1232,7 +1232,7 @@
</span><span class="cx"> WebKitDownload* webkitWebContextStartDownload(WebKitWebContext* context, const char* uri, WebPageProxy* initiatingPage)
</span><span class="cx"> {
</span><span class="cx"> WebCore::ResourceRequest request(String::fromUTF8(uri));
</span><del>- DownloadProxy* downloadProxy = context->priv->context->download(initiatingPage, request);
</del><ins>+ DownloadProxy* downloadProxy = context->priv->processPool->download(initiatingPage, request);
</ins><span class="cx"> WebKitDownload* download = webkitDownloadCreateForRequest(downloadProxy, request);
</span><span class="cx"> downloadsMap().set(downloadProxy, download);
</span><span class="cx"> return download;
</span><span class="lines">@@ -1256,11 +1256,11 @@
</span><span class="cx"> context->priv->webExtensionsInitializationUserData.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebProcessPool* webkitWebContextGetContext(WebKitWebContext* context)
</del><ins>+WebProcessPool* webkitWebContextGetProcessPool(WebKitWebContext* context)
</ins><span class="cx"> {
</span><span class="cx"> g_assert(WEBKIT_IS_WEB_CONTEXT(context));
</span><span class="cx">
</span><del>- return context->priv->context.get();
</del><ins>+ return context->priv->processPool.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebSoupCustomProtocolRequestManager* webkitWebContextGetRequestManager(WebKitWebContext* context)
</span><span class="lines">@@ -1304,7 +1304,7 @@
</span><span class="cx"> WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(webView);
</span><span class="cx">
</span><span class="cx"> auto pageConfiguration = API::PageConfiguration::create();
</span><del>- pageConfiguration->setProcessPool(context->priv->context.get());
</del><ins>+ pageConfiguration->setProcessPool(context->priv->processPool.get());
</ins><span class="cx"> pageConfiguration->setPreferences(webkitSettingsGetPreferences(webkit_web_view_get_settings(webView)));
</span><span class="cx"> pageConfiguration->setRelatedPage(relatedView ? webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(relatedView)) : nullptr);
</span><span class="cx"> pageConfiguration->setUserContentController(userContentManager ? webkitUserContentManagerGetUserContentControllerProxy(userContentManager) : nullptr);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h (194531 => 194532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h 2016-01-04 16:09:15 UTC (rev 194531)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h 2016-01-04 16:13:38 UTC (rev 194532)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #include "WebProcessPool.h"
</span><span class="cx"> #include "WebSoupCustomProtocolRequestManager.h"
</span><span class="cx">
</span><del>-WebKit::WebProcessPool* webkitWebContextGetContext(WebKitWebContext*);
</del><ins>+WebKit::WebProcessPool* webkitWebContextGetProcessPool(WebKitWebContext*);
</ins><span class="cx"> WebKitDownload* webkitWebContextGetOrCreateDownload(WebKit::DownloadProxy*);
</span><span class="cx"> WebKitDownload* webkitWebContextStartDownload(WebKitWebContext*, const char* uri, WebKit::WebPageProxy*);
</span><span class="cx"> void webkitWebContextRemoveDownload(WebKit::DownloadProxy*);
</span></span></pre>
</div>
</div>
</body>
</html>