<!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>[176876] trunk</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/176876">176876</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-05 15:00:58 -0800 (Fri, 05 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Give all web pages a website data store
https://bugs.webkit.org/show_bug.cgi?id=139317
Reviewed by Tim Horton.
Source/WebKit2:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
Set the website data store on the window.
* UIProcess/WebContext.cpp:
(WebKit::websiteDataStoreConfiguration):
Helper function that will create the default website data store configuration for a context.
(WebKit::WebContext::WebContext):
Create a new, per-context data store.
(WebKit::WebContext::createWebPage):
If we don't have a data store filled in, use the default per-context one.
* UIProcess/WebContext.h:
* UIProcess/WebPageProxy.h:
Tools:
* MiniBrowser/mac/AppDelegate.m:
(-[BrowserAppDelegate newPrivateWindow:]):
Don't release the controller - it's implicitly retained by the window.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContexth">trunk/Source/WebKit2/UIProcess/WebContext.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacAppDelegatem">trunk/Tools/MiniBrowser/mac/AppDelegate.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176875 => 176876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-05 22:43:44 UTC (rev 176875)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-05 23:00:58 UTC (rev 176876)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2014-12-05 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Give all web pages a website data store
+ https://bugs.webkit.org/show_bug.cgi?id=139317
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ Set the website data store on the window.
+
+ * UIProcess/WebContext.cpp:
+ (WebKit::websiteDataStoreConfiguration):
+ Helper function that will create the default website data store configuration for a context.
+
+ (WebKit::WebContext::WebContext):
+ Create a new, per-context data store.
+
+ (WebKit::WebContext::createWebPage):
+ If we don't have a data store filled in, use the default per-context one.
+
+ * UIProcess/WebContext.h:
+ * UIProcess/WebPageProxy.h:
+
+2014-12-05 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Move the website data store code to a new file
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139312
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (176875 => 176876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-12-05 22:43:44 UTC (rev 176875)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-12-05 23:00:58 UTC (rev 176876)
</span><span class="lines">@@ -271,7 +271,8 @@
</span><span class="cx">
</span><span class="cx"> webPageConfiguration.userContentController = [_configuration userContentController]->_userContentControllerProxy.get();
</span><span class="cx"> webPageConfiguration.visitedLinkProvider = [_configuration _visitedLinkProvider]->_visitedLinkProvider.get();
</span><del>- webPageConfiguration.sessionID = [_configuration _websiteDataStore]->_websiteDataStore->websiteDataStore().sessionID();
</del><ins>+ webPageConfiguration.websiteDataStore = &[_configuration _websiteDataStore]->_websiteDataStore->websiteDataStore();
+ webPageConfiguration.sessionID = webPageConfiguration.websiteDataStore->sessionID();
</ins><span class="cx">
</span><span class="cx"> RefPtr<WebKit::WebPageGroup> pageGroup;
</span><span class="cx"> NSString *groupIdentifier = configuration._groupIdentifier;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (176875 => 176876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-12-05 22:43:44 UTC (rev 176875)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-12-05 23:00:58 UTC (rev 176876)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx"> #include "WebProcessMessages.h"
</span><span class="cx"> #include "WebProcessProxy.h"
</span><span class="cx"> #include "WebResourceCacheManagerProxy.h"
</span><ins>+#include "WebsiteDataStore.h"
</ins><span class="cx"> #include <WebCore/ApplicationCacheStorage.h>
</span><span class="cx"> #include <WebCore/Language.h>
</span><span class="cx"> #include <WebCore/LinkHash.h>
</span><span class="lines">@@ -150,6 +151,14 @@
</span><span class="cx"> return contexts();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static WebsiteDataStore::Configuration websiteDataStoreConfiguration()
+{
+ WebsiteDataStore::Configuration configuration;
+
+ // FIXME: Fill in the configuration.
+ return configuration;
+}
+
</ins><span class="cx"> WebContext::WebContext(WebContextConfiguration configuration)
</span><span class="cx"> : m_processModel(ProcessModelSharedSecondaryProcess)
</span><span class="cx"> , m_webProcessCountLimit(UINT_MAX)
</span><span class="lines">@@ -167,6 +176,7 @@
</span><span class="cx"> , m_cacheModel(CacheModelDocumentViewer)
</span><span class="cx"> , m_memorySamplerEnabled(false)
</span><span class="cx"> , m_memorySamplerInterval(1400.0)
</span><ins>+ , m_websiteDataStore(WebsiteDataStore::create(websiteDataStoreConfiguration()))
</ins><span class="cx"> , m_storageManager(StorageManager::create(configuration.localStorageDirectory))
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx"> , m_initialHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain)
</span><span class="lines">@@ -860,8 +870,11 @@
</span><span class="cx"> configuration.preferences = &configuration.pageGroup->preferences();
</span><span class="cx"> if (!configuration.visitedLinkProvider)
</span><span class="cx"> configuration.visitedLinkProvider = m_visitedLinkProvider.get();
</span><del>- if (!configuration.sessionID.isValid())
</del><ins>+ if (!configuration.websiteDataStore) {
+ ASSERT(!configuration.sessionID.isValid());
+ configuration.websiteDataStore = m_websiteDataStore.get();
</ins><span class="cx"> configuration.sessionID = configuration.preferences->privateBrowsingEnabled() ? SessionID::legacyPrivateSessionID() : SessionID::defaultSessionID();
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> RefPtr<WebProcessProxy> process;
</span><span class="cx"> if (m_processModel == ProcessModelSharedSecondaryProcess) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (176875 => 176876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.h 2014-12-05 22:43:44 UTC (rev 176875)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2014-12-05 23:00:58 UTC (rev 176876)
</span><span class="lines">@@ -505,6 +505,7 @@
</span><span class="cx"> RefPtr<WebPluginSiteDataManager> m_pluginSiteDataManager;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ RefPtr<WebsiteDataStore> m_websiteDataStore;
</ins><span class="cx"> RefPtr<StorageManager> m_storageManager;
</span><span class="cx">
</span><span class="cx"> typedef HashMap<const char*, RefPtr<WebContextSupplement>, PtrHash<const char*>> WebContextSupplementMap;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (176875 => 176876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-12-05 22:43:44 UTC (rev 176875)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-12-05 23:00:58 UTC (rev 176876)
</span><span class="lines">@@ -171,6 +171,7 @@
</span><span class="cx"> class WebProcessProxy;
</span><span class="cx"> class WebUserContentControllerProxy;
</span><span class="cx"> class WebWheelEvent;
</span><ins>+class WebsiteDataStore;
</ins><span class="cx"> struct ActionMenuHitTestResult;
</span><span class="cx"> struct AttributedString;
</span><span class="cx"> struct ColorSpaceData;
</span><span class="lines">@@ -227,7 +228,11 @@
</span><span class="cx"> WebUserContentControllerProxy* userContentController = nullptr;
</span><span class="cx"> VisitedLinkProvider* visitedLinkProvider = nullptr;
</span><span class="cx">
</span><ins>+ WebsiteDataStore* websiteDataStore = nullptr;
+ // FIXME: We currently have to pass the session ID separately here to support the legacy private browsing session.
+ // Once we get rid of it we should get rid of this configuration parameter as well.
</ins><span class="cx"> WebCore::SessionID sessionID;
</span><ins>+
</ins><span class="cx"> WebPageProxy* relatedPage = nullptr;
</span><span class="cx">
</span><span class="cx"> WebPreferencesStore::ValueMap preferenceValues;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (176875 => 176876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-12-05 22:43:44 UTC (rev 176875)
+++ trunk/Tools/ChangeLog 2014-12-05 23:00:58 UTC (rev 176876)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-12-05 Anders Carlsson <andersca@apple.com>
+
+ Give all web pages a website data store
+ https://bugs.webkit.org/show_bug.cgi?id=139317
+
+ Reviewed by Tim Horton.
+
+ * MiniBrowser/mac/AppDelegate.m:
+ (-[BrowserAppDelegate newPrivateWindow:]):
+ Don't release the controller - it's implicitly retained by the window.
+
</ins><span class="cx"> 2014-12-05 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] DumpRenderTree fails to render every other test when pixel tests are on
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacAppDelegatem"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.m (176875 => 176876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/AppDelegate.m 2014-12-05 22:43:44 UTC (rev 176875)
+++ trunk/Tools/MiniBrowser/mac/AppDelegate.m 2014-12-05 23:00:58 UTC (rev 176876)
</span><span class="lines">@@ -110,7 +110,6 @@
</span><span class="cx">
</span><span class="cx"> [[controller window] makeKeyAndOrderFront:sender];
</span><span class="cx"> [_browserWindowControllers addObject:controller];
</span><del>- [controller release];
</del><span class="cx">
</span><span class="cx"> [controller loadURLString:[SettingsController shared].defaultURL];
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>