<!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>[176875] 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/176875">176875</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-05 14:43:44 -0800 (Fri, 05 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move the website data store code to a new file
https://bugs.webkit.org/show_bug.cgi?id=139312
Reviewed by Tim Horton.
It's weird to have all the website data code in the API class, so move it to a new file.
* UIProcess/API/APIWebsiteDataStore.cpp:
(API::WebsiteDataStore::WebsiteDataStore):
(API::WebsiteDataStore::isNonPersistent):
(API::generateNonPersistentSessionID): Deleted.
* UIProcess/API/APIWebsiteDataStore.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
* UIProcess/WebsiteData/WebsiteDataStore.cpp: Copied from Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp.
(WebKit::generateNonPersistentSessionID):
(WebKit::WebsiteDataStore::createNonPersistent):
(WebKit::WebsiteDataStore::create):
(WebKit::WebsiteDataStore::WebsiteDataStore):
(WebKit::WebsiteDataStore::~WebsiteDataStore):
* UIProcess/WebsiteData/WebsiteDataStore.h: Copied from Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h.
(WebKit::WebsiteDataStore::isNonPersistent):
(WebKit::WebsiteDataStore::sessionID):
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<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="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/Source/WebKit2/UIProcess/WebsiteData/</li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStoreh">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176874 => 176875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-05 22:22:15 UTC (rev 176874)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-05 22:43:44 UTC (rev 176875)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-12-05 Anders Carlsson <andersca@apple.com>
+
+ Move the website data store code to a new file
+ https://bugs.webkit.org/show_bug.cgi?id=139312
+
+ Reviewed by Tim Horton.
+
+ It's weird to have all the website data code in the API class, so move it to a new file.
+
+ * UIProcess/API/APIWebsiteDataStore.cpp:
+ (API::WebsiteDataStore::WebsiteDataStore):
+ (API::WebsiteDataStore::isNonPersistent):
+ (API::generateNonPersistentSessionID): Deleted.
+ * UIProcess/API/APIWebsiteDataStore.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp: Copied from Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp.
+ (WebKit::generateNonPersistentSessionID):
+ (WebKit::WebsiteDataStore::createNonPersistent):
+ (WebKit::WebsiteDataStore::create):
+ (WebKit::WebsiteDataStore::WebsiteDataStore):
+ (WebKit::WebsiteDataStore::~WebsiteDataStore):
+ * UIProcess/WebsiteData/WebsiteDataStore.h: Copied from Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h.
+ (WebKit::WebsiteDataStore::isNonPersistent):
+ (WebKit::WebsiteDataStore::sessionID):
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-12-05 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Keyboard input should be disabled in the preview popover
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp (176874 => 176875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp 2014-12-05 22:22:15 UTC (rev 176874)
+++ trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp 2014-12-05 22:43:44 UTC (rev 176875)
</span><span class="lines">@@ -26,18 +26,10 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "APIWebsiteDataStore.h"
</span><span class="cx">
</span><del>-#include <WebCore/SessionID.h>
</del><ins>+#include "WebsiteDataStore.h"
</ins><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx">
</span><del>-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;
-}
-
</del><span class="cx"> RefPtr<WebsiteDataStore> WebsiteDataStore::defaultDataStore()
</span><span class="cx"> {
</span><span class="cx"> static WebsiteDataStore* defaultDataStore = adoptRef(new WebsiteDataStore(defaultDataStoreConfiguration())).leakRef();
</span><span class="lines">@@ -51,12 +43,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebsiteDataStore::WebsiteDataStore()
</span><del>- : m_sessionID(WebCore::SessionID(generateNonPersistentSessionID()))
</del><ins>+ : m_websiteDataStore(WebKit::WebsiteDataStore::createNonPersistent())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebsiteDataStore::WebsiteDataStore(Configuration configuration)
- : m_sessionID(WebCore::SessionID::defaultSessionID())
</del><ins>+WebsiteDataStore::WebsiteDataStore(WebKit::WebsiteDataStore::Configuration configuration)
+ : m_websiteDataStore(WebKit::WebsiteDataStore::create(WTF::move(configuration)))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -66,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> bool WebsiteDataStore::isNonPersistent()
</span><span class="cx"> {
</span><del>- return m_sessionID.isEphemeral();
</del><ins>+ return m_websiteDataStore->isNonPersistent();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIWebsiteDataStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h (176874 => 176875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h 2014-12-05 22:22:15 UTC (rev 176874)
+++ trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h 2014-12-05 22:43:44 UTC (rev 176875)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define APIWebsiteDataStore_h
</span><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><ins>+#include "WebsiteDataStore.h"
</ins><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -34,25 +35,21 @@
</span><span class="cx">
</span><span class="cx"> class WebsiteDataStore final : public ObjectImpl<Object::Type::WebsiteDataStore> {
</span><span class="cx"> public:
</span><del>- struct Configuration {
- // FIXME: Add configuration parameters here.
- };
-
</del><span class="cx"> static RefPtr<WebsiteDataStore> defaultDataStore();
</span><span class="cx"> static RefPtr<WebsiteDataStore> createNonPersistentDataStore();
</span><span class="cx"> virtual ~WebsiteDataStore();
</span><span class="cx">
</span><span class="cx"> bool isNonPersistent();
</span><span class="cx">
</span><del>- WebCore::SessionID sessionID() const { return m_sessionID; }
</del><ins>+ WebKit::WebsiteDataStore& websiteDataStore() { return *m_websiteDataStore; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- static Configuration defaultDataStoreConfiguration();
-
</del><ins>+ WebsiteDataStore(WebKit::WebsiteDataStore::Configuration);
</ins><span class="cx"> WebsiteDataStore();
</span><del>- WebsiteDataStore(Configuration);
</del><span class="cx">
</span><del>- WebCore::SessionID m_sessionID;
</del><ins>+ static WebKit::WebsiteDataStore::Configuration defaultDataStoreConfiguration();
+
+ RefPtr<WebKit::WebsiteDataStore> m_websiteDataStore;
</ins><span class="cx"> };
</span><span class="cx">
</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 (176874 => 176875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-12-05 22:22:15 UTC (rev 176874)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-12-05 22:43:44 UTC (rev 176875)
</span><span class="lines">@@ -271,7 +271,7 @@
</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->sessionID();
</del><ins>+ webPageConfiguration.sessionID = [_configuration _websiteDataStore]->_websiteDataStore->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="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecppfromrev176870trunkSourceWebKit2UIProcessAPIAPIWebsiteDataStorecpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (from rev 176870, trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp) (0 => 176875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2014-12-05 22:43:44 UTC (rev 176875)
</span><span class="lines">@@ -0,0 +1,63 @@
</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 "WebsiteDataStore.h"
+
+namespace WebKit {
+
+static WebCore::SessionID generateNonPersistentSessionID()
+{
+ // FIXME: We count backwards here to not conflict with API::Session.
+ static uint64_t sessionID = std::numeric_limits<uint64_t>::max();
+
+ return WebCore::SessionID(--sessionID);
+}
+
+RefPtr<WebsiteDataStore::WebsiteDataStore> WebsiteDataStore::createNonPersistent()
+{
+ return adoptRef(new WebsiteDataStore(generateNonPersistentSessionID()));
+}
+
+RefPtr<WebsiteDataStore> WebsiteDataStore::create(Configuration configuration)
+{
+ return adoptRef(new WebsiteDataStore(WTF::move(configuration)));
+}
+
+WebsiteDataStore::WebsiteDataStore(Configuration configuration)
+ : m_sessionID(WebCore::SessionID::defaultSessionID())
+{
+}
+
+WebsiteDataStore::WebsiteDataStore(WebCore::SessionID sessionID)
+ : m_sessionID(sessionID)
+{
+}
+
+WebsiteDataStore::~WebsiteDataStore()
+{
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorehfromrev176870trunkSourceWebKit2UIProcessAPIAPIWebsiteDataStoreh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h (from rev 176870, trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h) (0 => 176875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h 2014-12-05 22:43:44 UTC (rev 176875)
</span><span class="lines">@@ -0,0 +1,55 @@
</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 WebsiteDataStore_h
+#define WebsiteDataStore_h
+
+#include <WebCore/SessionID.h>
+#include <wtf/RefCounted.h>
+#include <wtf/RefPtr.h>
+
+namespace WebKit {
+
+class WebsiteDataStore : public RefCounted<WebsiteDataStore> {
+public:
+ struct Configuration {
+ };
+ static RefPtr<WebsiteDataStore> createNonPersistent();
+ static RefPtr<WebsiteDataStore> create(Configuration);
+ virtual ~WebsiteDataStore();
+
+ bool isNonPersistent() const { return m_sessionID.isEphemeral(); }
+ WebCore::SessionID sessionID() const { return m_sessionID; }
+
+private:
+ explicit WebsiteDataStore(WebCore::SessionID);
+ explicit WebsiteDataStore(Configuration);
+
+ WebCore::SessionID m_sessionID;
+};
+
+}
+
+#endif // WebsiteDataStore_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (176874 => 176875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-12-05 22:22:15 UTC (rev 176874)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-12-05 22:43:44 UTC (rev 176875)
</span><span class="lines">@@ -253,6 +253,8 @@
</span><span class="cx"> 1A4D664E18A3031B00D82E21 /* WKFrameInfoInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4D664D18A3031B00D82E21 /* WKFrameInfoInternal.h */; };
</span><span class="cx"> 1A50DB66110A3D57000D3FE5 /* WebProcess.app in Copy Files */ = {isa = PBXBuildFile; fileRef = 1A50DB1E110A3BDC000D3FE5 /* WebProcess.app */; };
</span><span class="cx"> 1A53C2A21A323004004E8C70 /* InjectedBundleCSSStyleDeclarationHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4ED3261A3119D90079BD49 /* InjectedBundleCSSStyleDeclarationHandle.cpp */; };
</span><ins>+ 1A53C2A91A32572B004E8C70 /* WebsiteDataStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A53C2A41A32569F004E8C70 /* WebsiteDataStore.cpp */; };
+ 1A53C2AA1A325730004E8C70 /* WebsiteDataStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A53C2A51A32569F004E8C70 /* WebsiteDataStore.h */; };
</ins><span class="cx"> 1A5B1C501898606F004FCF9B /* WKNavigation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A5B1C4E1898606F004FCF9B /* WKNavigation.mm */; };
</span><span class="cx"> 1A5B1C511898606F004FCF9B /* WKNavigation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5B1C4F1898606F004FCF9B /* WKNavigation.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><span class="cx"> 1A5B1C5418987EDF004FCF9B /* WebDocumentLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5B1C5218987EDF004FCF9B /* WebDocumentLoader.cpp */; };
</span><span class="lines">@@ -2232,6 +2234,8 @@
</span><span class="cx"> 1A4F976E100E7B6600637A18 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> 1A50DB1E110A3BDC000D3FE5 /* WebProcess.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WebProcess.app; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx"> 1A50F0F819199E42001ACD12 /* WebKit2.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKit2.xcconfig; sourceTree = "<group>"; };
</span><ins>+ 1A53C2A41A32569F004E8C70 /* WebsiteDataStore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebsiteDataStore.cpp; sourceTree = "<group>"; };
+ 1A53C2A51A32569F004E8C70 /* WebsiteDataStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebsiteDataStore.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1A5B1C4E1898606F004FCF9B /* WKNavigation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNavigation.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1A5B1C4F1898606F004FCF9B /* WKNavigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigation.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A5B1C5218987EDF004FCF9B /* WebDocumentLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebDocumentLoader.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4261,6 +4265,23 @@
</span><span class="cx"> tabWidth = 8;
</span><span class="cx"> usesTabs = 0;
</span><span class="cx"> };
</span><ins>+ 1A53C2A31A325691004E8C70 /* WebsiteData */ = {
+ isa = PBXGroup;
+ children = (
+ 1A53C2A81A325724004E8C70 /* Cocoa */,
+ 1A53C2A41A32569F004E8C70 /* WebsiteDataStore.cpp */,
+ 1A53C2A51A32569F004E8C70 /* WebsiteDataStore.h */,
+ );
+ path = WebsiteData;
+ sourceTree = "<group>";
+ };
+ 1A53C2A81A325724004E8C70 /* Cocoa */ = {
+ isa = PBXGroup;
+ children = (
+ );
+ path = Cocoa;
+ sourceTree = "<group>";
+ };
</ins><span class="cx"> 1A6280CA19199754006AD9F9 /* WebKit2 Framework */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -5832,6 +5853,7 @@
</span><span class="cx"> 0F594793187B3B4C00437857 /* Scrolling */,
</span><span class="cx"> 1A44B95816B73F8C00B7BBD8 /* Storage */,
</span><span class="cx"> 1AAF089E192681AC00B6390C /* UserContent */,
</span><ins>+ 1A53C2A31A325691004E8C70 /* WebsiteData */,
</ins><span class="cx"> 1AE52F8F19201DA700A1FA37 /* APIContextConfiguration.cpp */,
</span><span class="cx"> 1AE52F9019201DA700A1FA37 /* APIContextConfiguration.h */,
</span><span class="cx"> BCF69FA11176D01400471A52 /* APINavigationData.cpp */,
</span><span class="lines">@@ -7366,6 +7388,7 @@
</span><span class="cx"> 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */,
</span><span class="cx"> 1A1DC340196346D700FF7059 /* LegacySessionStateCoding.h in Headers */,
</span><span class="cx"> 2DA049B4180CCCD300AAFA9E /* PlatformCALayerRemote.h in Headers */,
</span><ins>+ 1A53C2AA1A325730004E8C70 /* WebsiteDataStore.h in Headers */,
</ins><span class="cx"> 1A2162B111F38971008AD0F5 /* NPRuntimeUtilities.h in Headers */,
</span><span class="cx"> 1AB8A1EC1840080900E9AE69 /* WKPageLoaderClient.h in Headers */,
</span><span class="cx"> 1A2D84A3127F6AD1001EB962 /* NPVariantData.h in Headers */,
</span><span class="lines">@@ -9086,6 +9109,7 @@
</span><span class="cx"> 1A2D90BB1281C931001EB962 /* PluginProcessProxyMac.mm in Sources */,
</span><span class="cx"> 1A043B5D124D5E9D00FFBFB5 /* PluginProcessProxyMessageReceiver.cpp in Sources */,
</span><span class="cx"> 1A043DC2124FF87500FFBFB5 /* PluginProxy.cpp in Sources */,
</span><ins>+ 1A53C2A91A32572B004E8C70 /* WebsiteDataStore.cpp in Sources */,
</ins><span class="cx"> 0FCB4E5018BBE044000FCFC9 /* WKGeolocationProviderIOS.mm in Sources */,
</span><span class="cx"> 1AC1336718565B5700F3EC05 /* UserData.cpp in Sources */,
</span><span class="cx"> 1A2D92211281DC1B001EB962 /* PluginProxyMac.mm in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>