<!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>[176847] 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/176847">176847</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-05 10:20:23 -0800 (Fri, 05 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add an API::WebsiteDataStore object and use it for _WKWebsiteDataStore
https://bugs.webkit.org/show_bug.cgi?id=139304
Reviewed by Tim Horton.
* Shared/APIObject.h:
* Shared/Cocoa/APIObject.mm:
(API::Object::newObject):
Make _WKWebsiteDataStore a wrapper for API::WebsiteDataStore instead of API::Session.
* UIProcess/API/APIWebsiteDataStore.cpp: Added.
(API::generateNonPersistentSessionID):
(API::WebsiteDataStore::defaultDataStore):
(API::WebsiteDataStore::createNonPersistentDataStore):
(API::WebsiteDataStore::WebsiteDataStore):
(API::WebsiteDataStore::~WebsiteDataStore):
(API::WebsiteDataStore::isNonPersistent):
Add new WebsiteDataStore implementation. Currently it only contains the WebCore Session ID, but more will be
added to it in upcoming commits.
* UIProcess/API/APIWebsiteDataStore.h:
Add header.
* UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm: Added.
(API::WebsiteDataStore::defaultDataStoreConfiguration):
Platform specific file that returns the default data store configuration.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
Set the session ID from the website data store.
* UIProcess/API/Cocoa/_WKWebsiteDataStore.mm:
(+[_WKWebsiteDataStore defaultDataStore]):
(+[_WKWebsiteDataStore nonPersistentDataStore]):
(-[_WKWebsiteDataStore dealloc]):
(-[_WKWebsiteDataStore isNonPersistent]):
(-[_WKWebsiteDataStore _apiObject]):
Update now that we wrap an API::WebsiteDataStore instead.
* UIProcess/API/Cocoa/_WKWebsiteDataStoreInternal.h:
(WebKit::wrapper):
Update for API::Session -> API::WebsiteDataStore change.
* WebKit2.xcodeproj/project.pbxproj:
Add new files.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoaWKFoundationh">trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIObjecth">trunk/Source/WebKit2/Shared/APIObject.h</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaAPIObjectmm">trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoremm">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoreInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreInternal.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIWebsiteDataStorecpp">trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIWebsiteDataStoreh">trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaAPIWebsiteDataStoreCocoamm">trunk/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176846 => 176847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-05 17:55:33 UTC (rev 176846)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-05 18:20:23 UTC (rev 176847)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2014-12-05 Anders Carlsson <andersca@apple.com>
+
+ Add an API::WebsiteDataStore object and use it for _WKWebsiteDataStore
+ https://bugs.webkit.org/show_bug.cgi?id=139304
+
+ Reviewed by Tim Horton.
+
+ * Shared/APIObject.h:
+ * Shared/Cocoa/APIObject.mm:
+ (API::Object::newObject):
+ Make _WKWebsiteDataStore a wrapper for API::WebsiteDataStore instead of API::Session.
+
+ * UIProcess/API/APIWebsiteDataStore.cpp: Added.
+ (API::generateNonPersistentSessionID):
+ (API::WebsiteDataStore::defaultDataStore):
+ (API::WebsiteDataStore::createNonPersistentDataStore):
+ (API::WebsiteDataStore::WebsiteDataStore):
+ (API::WebsiteDataStore::~WebsiteDataStore):
+ (API::WebsiteDataStore::isNonPersistent):
+ Add new WebsiteDataStore implementation. Currently it only contains the WebCore Session ID, but more will be
+ added to it in upcoming commits.
+
+ * UIProcess/API/APIWebsiteDataStore.h:
+ Add header.
+
+ * UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm: Added.
+ (API::WebsiteDataStore::defaultDataStoreConfiguration):
+ Platform specific file that returns the default data store configuration.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ Set the session ID from the website data store.
+
+ * UIProcess/API/Cocoa/_WKWebsiteDataStore.mm:
+ (+[_WKWebsiteDataStore defaultDataStore]):
+ (+[_WKWebsiteDataStore nonPersistentDataStore]):
+ (-[_WKWebsiteDataStore dealloc]):
+ (-[_WKWebsiteDataStore isNonPersistent]):
+ (-[_WKWebsiteDataStore _apiObject]):
+ Update now that we wrap an API::WebsiteDataStore instead.
+
+ * UIProcess/API/Cocoa/_WKWebsiteDataStoreInternal.h:
+ (WebKit::wrapper):
+ Update for API::Session -> API::WebsiteDataStore change.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ Add new files.
+
</ins><span class="cx"> 2014-12-05 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> FeatureDefines.xcconfig: Workaround bug in Xcode 5.1.1 when defining ENABLE_WEB_REPLAY
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoaWKFoundationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h (176846 => 176847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2014-12-05 17:55:33 UTC (rev 176846)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2014-12-05 18:20:23 UTC (rev 176847)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> #define WK_API_ENABLED 1
</span><span class="cx"> #else
</span><del>-#define WK_API_ENABLED (defined(__clang__) && defined(__APPLE__) && !defined(__i386__))
</del><ins>+#define WK_API_ENABLED 0// (defined(__clang__) && defined(__APPLE__) && !defined(__i386__))
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIObject.h (176846 => 176847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIObject.h 2014-12-05 17:55:33 UTC (rev 176846)
+++ trunk/Source/WebKit2/Shared/APIObject.h 2014-12-05 18:20:23 UTC (rev 176847)
</span><span class="lines">@@ -135,6 +135,7 @@
</span><span class="cx"> UserMediaPermissionRequest,
</span><span class="cx"> Vibration,
</span><span class="cx"> ViewportAttributes,
</span><ins>+ WebsiteDataStore,
</ins><span class="cx">
</span><span class="cx"> // Bundle types
</span><span class="cx"> Bundle,
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaAPIObjectmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm (176846 => 176847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2014-12-05 17:55:33 UTC (rev 176846)
+++ trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2014-12-05 18:20:23 UTC (rev 176847)
</span><span class="lines">@@ -136,10 +136,6 @@
</span><span class="cx"> wrapper = [WKBrowsingContextGroup alloc];
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case Type::Session:
- wrapper = [_WKWebsiteDataStore alloc];
- break;
-
</del><span class="cx"> case Type::String:
</span><span class="cx"> wrapper = NSAllocateObject([WKNSString class], size, nullptr);
</span><span class="cx"> break;
</span><span class="lines">@@ -152,6 +148,10 @@
</span><span class="cx"> wrapper = NSAllocateObject([WKNSURLRequest class], size, nullptr);
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case Type::WebsiteDataStore:
+ wrapper = [_WKWebsiteDataStore alloc];
+ break;
+
</ins><span class="cx"> case Type::BundleFrame:
</span><span class="cx"> wrapper = [WKWebProcessPlugInFrame alloc];
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIWebsiteDataStorecppfromrev176846trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoremm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp (from rev 176846, trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm) (0 => 176847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp 2014-12-05 18:20:23 UTC (rev 176847)
</span><span class="lines">@@ -0,0 +1,72 @@
</span><ins>+/*
+ * Copyright (C) 2014 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"
+#include "APIWebsiteDataStore.h"
+
+#include <WebCore/SessionID.h>
+
+namespace API {
+
+static uint64_t generateNonPersistentSessionID()
+{
+ // FIXME: We count backwards here to not conflict with API::Session.
+ static uint64_t sessionID = std::numeric_limits<uint64_t>::max();
+
+ return --sessionID;
+}
+
+RefPtr<WebsiteDataStore> WebsiteDataStore::defaultDataStore()
+{
+ static WebsiteDataStore* defaultDataStore = adoptRef(new WebsiteDataStore(defaultDataStoreConfiguration())).leakRef();
+
+ return defaultDataStore;
+}
+
+RefPtr<WebsiteDataStore> WebsiteDataStore::createNonPersistentDataStore()
+{
+ return adoptRef(new WebsiteDataStore);
+}
+
+WebsiteDataStore::WebsiteDataStore()
+ : m_sessionID(WebCore::SessionID(generateNonPersistentSessionID()))
+{
+}
+
+WebsiteDataStore::WebsiteDataStore(Configuration configuration)
+ : m_sessionID(WebCore::SessionID::defaultSessionID())
+{
+}
+
+WebsiteDataStore::~WebsiteDataStore()
+{
+}
+
+bool WebsiteDataStore::isNonPersistent()
+{
+ return m_sessionID.isEphemeral();
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIWebsiteDataStorehfromrev176846trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoremm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h (from rev 176846, trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm) (0 => 176847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h 2014-12-05 18:20:23 UTC (rev 176847)
</span><span class="lines">@@ -0,0 +1,60 @@
</span><ins>+/*
+ * Copyright (C) 2014 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.
+ */
+
+#ifndef APIWebsiteDataStore_h
+#define APIWebsiteDataStore_h
+
+#include "APIObject.h"
+#include <WebCore/SessionID.h>
+#include <wtf/text/WTFString.h>
+
+namespace API {
+
+class WebsiteDataStore final : public ObjectImpl<Object::Type::WebsiteDataStore> {
+public:
+ struct Configuration {
+ // FIXME: Add configuration parameters here.
+ };
+
+ static RefPtr<WebsiteDataStore> defaultDataStore();
+ static RefPtr<WebsiteDataStore> createNonPersistentDataStore();
+ virtual ~WebsiteDataStore();
+
+ bool isNonPersistent();
+
+ WebCore::SessionID sessionID() const { return m_sessionID; }
+
+private:
+ static Configuration defaultDataStoreConfiguration();
+
+ WebsiteDataStore();
+ WebsiteDataStore(Configuration);
+
+ WebCore::SessionID m_sessionID;
+};
+
+}
+
+#endif // APIWebsiteDataStore_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaAPIWebsiteDataStoreCocoammfromrev176846trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoreInternalh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm (from rev 176846, trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreInternal.h) (0 => 176847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm 2014-12-05 18:20:23 UTC (rev 176847)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+/*
+ * Copyright (C) 2014 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"
+#include "APIWebsiteDataStore.h"
+
+namespace API {
+
+WebsiteDataStore::Configuration WebsiteDataStore::defaultDataStoreConfiguration()
+{
+ // FIXME: Fill everything in.
+ Configuration configuration;
+
+ return configuration;
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (176846 => 176847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-12-05 17:55:33 UTC (rev 176846)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-12-05 18:20:23 UTC (rev 176847)
</span><span class="lines">@@ -271,8 +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]->_session->getID();
-
</del><ins>+ webPageConfiguration.sessionID = [_configuration _websiteDataStore]->_websiteDataStore->sessionID();
+
</ins><span class="cx"> RefPtr<WebKit::WebPageGroup> pageGroup;
</span><span class="cx"> NSString *groupIdentifier = configuration._groupIdentifier;
</span><span class="cx"> if (groupIdentifier.length) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm (176846 => 176847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm 2014-12-05 17:55:33 UTC (rev 176846)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm 2014-12-05 18:20:23 UTC (rev 176847)
</span><span class="lines">@@ -28,38 +28,35 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-using namespace WebKit;
-
</del><span class="cx"> @implementation _WKWebsiteDataStore
</span><span class="cx">
</span><span class="cx"> + (instancetype)defaultDataStore
</span><span class="cx"> {
</span><del>- return wrapper(API::Session::defaultSession());
</del><ins>+ return WebKit::wrapper(*API::WebsiteDataStore::defaultDataStore().get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (instancetype)nonPersistentDataStore
</span><span class="cx"> {
</span><del>- RefPtr<API::Session> session = API::Session::createEphemeral();
- return [wrapper(*session.release().leakRef()) autorelease];
</del><ins>+ return [WebKit::wrapper(*API::WebsiteDataStore::createNonPersistentDataStore().release().leakRef()) autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><del>- _session->API::Session::~Session();
</del><ins>+ _websiteDataStore->API::WebsiteDataStore::~WebsiteDataStore();
</ins><span class="cx">
</span><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)isNonPersistent
</span><span class="cx"> {
</span><del>- return _session->isEphemeral();
</del><ins>+ return _websiteDataStore->isNonPersistent();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark WKObject protocol implementation
</span><span class="cx">
</span><span class="cx"> - (API::Object&)_apiObject
</span><span class="cx"> {
</span><del>- return *_session;
</del><ins>+ return *_websiteDataStore;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoreInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreInternal.h (176846 => 176847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreInternal.h 2014-12-05 17:55:33 UTC (rev 176846)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreInternal.h 2014-12-05 18:20:23 UTC (rev 176847)
</span><span class="lines">@@ -27,22 +27,22 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import "APIWebsiteDataStore.h"
</ins><span class="cx"> #import "WKObject.h"
</span><del>-#import "APISession.h"
</del><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-inline _WKWebsiteDataStore *wrapper(API::Session& session)
</del><ins>+inline _WKWebsiteDataStore *wrapper(API::WebsiteDataStore& websiteDataStore)
</ins><span class="cx"> {
</span><del>- ASSERT([session.wrapper() isKindOfClass:[_WKWebsiteDataStore class]]);
- return (_WKWebsiteDataStore *)session.wrapper();
</del><ins>+ ASSERT([websiteDataStore.wrapper() isKindOfClass:[_WKWebsiteDataStore class]]);
+ return (_WKWebsiteDataStore *)websiteDataStore.wrapper();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @interface _WKWebsiteDataStore () <WKObject> {
</span><span class="cx"> @package
</span><del>- API::ObjectStorage<API::Session> _session;
</del><ins>+ API::ObjectStorage<API::WebsiteDataStore> _websiteDataStore;
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (176846 => 176847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-12-05 17:55:33 UTC (rev 176846)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-12-05 18:20:23 UTC (rev 176847)
</span><span class="lines">@@ -212,6 +212,9 @@
</span><span class="cx"> 1A30EAC6115D7DA30053E937 /* ConnectionMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A30EAC5115D7DA30053E937 /* ConnectionMac.mm */; };
</span><span class="cx"> 1A334DED16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */; };
</span><span class="cx"> 1A334DEE16DE8F88006A8E38 /* StorageAreaMapMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A334DEC16DE8F88006A8E38 /* StorageAreaMapMessages.h */; };
</span><ins>+ 1A3635A91A3144A300ED6197 /* APIWebsiteDataStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3635A71A3144A300ED6197 /* APIWebsiteDataStore.cpp */; };
+ 1A3635AA1A3144A300ED6197 /* APIWebsiteDataStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3635A81A3144A300ED6197 /* APIWebsiteDataStore.h */; };
+ 1A3635AD1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A3635AB1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm */; };
</ins><span class="cx"> 1A3C888018A5ABAE00C4C962 /* WKPreferencesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */; };
</span><span class="cx"> 1A3CC16618906ACF001E6ED8 /* WKWebView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A3CC16418906ACF001E6ED8 /* WKWebView.mm */; };
</span><span class="cx"> 1A3CC16718906ACF001E6ED8 /* WKWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3CC16518906ACF001E6ED8 /* WKWebView.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><span class="lines">@@ -2183,6 +2186,9 @@
</span><span class="cx"> 1A334DEA16DE8B68006A8E38 /* StorageAreaMap.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = StorageAreaMap.messages.in; sourceTree = "<group>"; };
</span><span class="cx"> 1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageAreaMapMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A334DEC16DE8F88006A8E38 /* StorageAreaMapMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageAreaMapMessages.h; sourceTree = "<group>"; };
</span><ins>+ 1A3635A71A3144A300ED6197 /* APIWebsiteDataStore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIWebsiteDataStore.cpp; sourceTree = "<group>"; };
+ 1A3635A81A3144A300ED6197 /* APIWebsiteDataStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIWebsiteDataStore.h; sourceTree = "<group>"; };
+ 1A3635AB1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = APIWebsiteDataStoreCocoa.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferencesInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A3CC16418906ACF001E6ED8 /* WKWebView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebView.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1A3CC16518906ACF001E6ED8 /* WKWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebView.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -5061,6 +5067,7 @@
</span><span class="cx"> 75A8D2C4187CCF9F00C39C9E /* _WKWebsiteDataStore.h */,
</span><span class="cx"> 75A8D2C5187CCF9F00C39C9E /* _WKWebsiteDataStore.mm */,
</span><span class="cx"> 75A8D2D4187D1C0100C39C9E /* _WKWebsiteDataStoreInternal.h */,
</span><ins>+ 1A3635AB1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm */,
</ins><span class="cx"> 1AFDE64319510B5500C48FFA /* LegacyBundleForClass.mm */,
</span><span class="cx"> 37C4C08B1814AC5C003688B9 /* WKBackForwardList.h */,
</span><span class="cx"> 37C4C08A1814AC5C003688B9 /* WKBackForwardList.mm */,
</span><span class="lines">@@ -5969,6 +5976,8 @@
</span><span class="cx"> 1AFDE65F1954E9B100C48FFA /* APISessionState.cpp */,
</span><span class="cx"> 1AFDE6601954E9B100C48FFA /* APISessionState.h */,
</span><span class="cx"> 1A4D664718A2D91A00D82E21 /* APIUIClient.h */,
</span><ins>+ 1A3635A71A3144A300ED6197 /* APIWebsiteDataStore.cpp */,
+ 1A3635A81A3144A300ED6197 /* APIWebsiteDataStore.h */,
</ins><span class="cx"> );
</span><span class="cx"> path = API;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -7233,6 +7242,7 @@
</span><span class="cx"> 1A90C1F41264FD71003E44D4 /* FindController.h in Headers */,
</span><span class="cx"> 515E7728183DD6F60007203F /* AsyncRequest.h in Headers */,
</span><span class="cx"> BCE81D8D1319F7EF00241910 /* FontInfo.h in Headers */,
</span><ins>+ 1A3635AA1A3144A300ED6197 /* APIWebsiteDataStore.h in Headers */,
</ins><span class="cx"> 1ABC3DFC1899F51C004F0626 /* WKNavigationDelegate.h in Headers */,
</span><span class="cx"> 1AE52F9219201DA700A1FA37 /* APIContextConfiguration.h in Headers */,
</span><span class="cx"> 7C361D731927FA360036A59D /* WebScriptMessageHandler.h in Headers */,
</span><span class="lines">@@ -9030,6 +9040,7 @@
</span><span class="cx"> 2D2ADF0916362DD500197E47 /* PDFPluginTextAnnotation.mm in Sources */,
</span><span class="cx"> BCC43ABA127B95DC00317F16 /* PlatformPopupMenuData.cpp in Sources */,
</span><span class="cx"> 1A6FB7D211E651E200DB1371 /* Plugin.cpp in Sources */,
</span><ins>+ 1A3635AD1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm in Sources */,
</ins><span class="cx"> CEDBA84719FDA00A006866A5 /* WebSQLiteDatabaseTracker.cpp in Sources */,
</span><span class="cx"> 31A67E0C165B2A99006CBA66 /* PlugInAutoStartProvider.cpp in Sources */,
</span><span class="cx"> 1A8EF4CC1252403700F7067F /* PluginControllerProxy.cpp in Sources */,
</span><span class="lines">@@ -9170,6 +9181,7 @@
</span><span class="cx"> 2D125C5F1857EA05003BA3CB /* ViewGestureControllerMac.mm in Sources */,
</span><span class="cx"> BC82839916B48DC000A278FE /* WebContentServiceEntryPoint.mm in Sources */,
</span><span class="cx"> 2684054F18B86C8E0022C38B /* ViewUpdateDispatcher.cpp in Sources */,
</span><ins>+ 1A3635A91A3144A300ED6197 /* APIWebsiteDataStore.cpp in Sources */,
</ins><span class="cx"> BCB9E2441120DACA00A137E0 /* WebContext.cpp in Sources */,
</span><span class="cx"> 31A505F91680025500A930EB /* WebContextClient.cpp in Sources */,
</span><span class="cx"> BC09B8F8147460F7005F5625 /* WebContextConnectionClient.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>