<!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>[182873] 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/182873">182873</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-04-15 17:45:24 -0700 (Wed, 15 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make WKWebsiteDataStore public
https://bugs.webkit.org/show_bug.cgi?id=143805
Reviewed by Dan Bernstein.
Rename the current _WKWebsiteDataStore to WKWebsiteDataStore. Make init unavailable and tighten up the
types of the defaultDataStore and nonPersistentDataStore class methods.
Add a new _WKWebsiteDataStore @interface and @implementation that derives from WKWebsiteDataStore
and forwards the defaultDataStore and nonPersistentDataStore method calls.
* Shared/API/Cocoa/WebKit.h:
* Shared/Cocoa/APIObject.mm:
(API::Object::newObject):
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration _websiteDataStore]):
* UIProcess/API/Cocoa/WKWebsiteDataStore.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h.
* UIProcess/API/Cocoa/WKWebsiteDataStore.mm: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm.
(+[WKWebsiteDataStore defaultDataStore]):
(+[WKWebsiteDataStore nonPersistentDataStore]):
(-[WKWebsiteDataStore dealloc]):
(-[WKWebsiteDataStore isNonPersistent]):
(toSystemClockTime):
(-[WKWebsiteDataStore fetchDataRecordsOfTypes:completionHandler:]):
(-[WKWebsiteDataStore removeDataOfTypes:modifiedSince:completionHandler:]):
(toWebsiteDataRecords):
(-[WKWebsiteDataStore removeDataOfTypes:forDataRecords:completionHandler:]):
(-[WKWebsiteDataStore _apiObject]):
* UIProcess/API/Cocoa/WKWebsiteDataStoreInternal.h: Renamed from Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreInternal.h.
(WebKit::wrapper):
* UIProcess/API/Cocoa/_WKWebsiteDataStore.h:
* UIProcess/API/Cocoa/_WKWebsiteDataStore.mm:
(+[_WKWebsiteDataStore defaultDataStore]):
(+[_WKWebsiteDataStore nonPersistentDataStore]):
(-[_WKWebsiteDataStore dealloc]): Deleted.
(-[_WKWebsiteDataStore isNonPersistent]): Deleted.
(toWebsiteDataTypes): Deleted.
(toSystemClockTime): Deleted.
(-[_WKWebsiteDataStore removeDataOfTypes:modifiedSince:completionHandler:]): Deleted.
(-[_WKWebsiteDataStore _apiObject]): Deleted.
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoaWebKith">trunk/Source/WebKit2/Shared/API/Cocoa/WebKit.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="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoreh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoremm">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStoreh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStoremm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStoreInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStoreInternal.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoreInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreInternal.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182872 => 182873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-16 00:15:11 UTC (rev 182872)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-16 00:45:24 UTC (rev 182873)
</span><span class="lines">@@ -1,3 +1,49 @@
</span><ins>+2015-04-15 Anders Carlsson <andersca@apple.com>
+
+ Make WKWebsiteDataStore public
+ https://bugs.webkit.org/show_bug.cgi?id=143805
+
+ Reviewed by Dan Bernstein.
+
+ Rename the current _WKWebsiteDataStore to WKWebsiteDataStore. Make init unavailable and tighten up the
+ types of the defaultDataStore and nonPersistentDataStore class methods.
+
+ Add a new _WKWebsiteDataStore @interface and @implementation that derives from WKWebsiteDataStore
+ and forwards the defaultDataStore and nonPersistentDataStore method calls.
+
+ * Shared/API/Cocoa/WebKit.h:
+ * Shared/Cocoa/APIObject.mm:
+ (API::Object::newObject):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration _websiteDataStore]):
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h.
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.mm: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm.
+ (+[WKWebsiteDataStore defaultDataStore]):
+ (+[WKWebsiteDataStore nonPersistentDataStore]):
+ (-[WKWebsiteDataStore dealloc]):
+ (-[WKWebsiteDataStore isNonPersistent]):
+ (toSystemClockTime):
+ (-[WKWebsiteDataStore fetchDataRecordsOfTypes:completionHandler:]):
+ (-[WKWebsiteDataStore removeDataOfTypes:modifiedSince:completionHandler:]):
+ (toWebsiteDataRecords):
+ (-[WKWebsiteDataStore removeDataOfTypes:forDataRecords:completionHandler:]):
+ (-[WKWebsiteDataStore _apiObject]):
+ * UIProcess/API/Cocoa/WKWebsiteDataStoreInternal.h: Renamed from Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreInternal.h.
+ (WebKit::wrapper):
+ * UIProcess/API/Cocoa/_WKWebsiteDataStore.h:
+ * UIProcess/API/Cocoa/_WKWebsiteDataStore.mm:
+ (+[_WKWebsiteDataStore defaultDataStore]):
+ (+[_WKWebsiteDataStore nonPersistentDataStore]):
+ (-[_WKWebsiteDataStore dealloc]): Deleted.
+ (-[_WKWebsiteDataStore isNonPersistent]): Deleted.
+ (toWebsiteDataTypes): Deleted.
+ (toSystemClockTime): Deleted.
+ (-[_WKWebsiteDataStore removeDataOfTypes:modifiedSince:completionHandler:]): Deleted.
+ (-[_WKWebsiteDataStore _apiObject]): Deleted.
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2015-04-15 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Custom CSS cursors do not use -webkit-image-set on retina displays
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoaWebKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WebKit.h (182872 => 182873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/WebKit.h 2015-04-16 00:15:11 UTC (rev 182872)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WebKit.h 2015-04-16 00:45:24 UTC (rev 182873)
</span><span class="lines">@@ -42,5 +42,6 @@
</span><span class="cx"> #import <WebKit/WKWebView.h>
</span><span class="cx"> #import <WebKit/WKWebViewConfiguration.h>
</span><span class="cx"> #import <WebKit/WKWebsiteDataRecord.h>
</span><ins>+#import <WebKit/WKWebsiteDataStore.h>
</ins><span class="cx"> #import <WebKit/WKWindowFeatures.h>
</span><span class="cx"> #import <WebKit/WebKitLegacy.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaAPIObjectmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm (182872 => 182873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2015-04-16 00:15:11 UTC (rev 182872)
+++ trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2015-04-16 00:45:24 UTC (rev 182873)
</span><span class="lines">@@ -58,13 +58,13 @@
</span><span class="cx"> #import "WKWebProcessPlugInPageGroupInternal.h"
</span><span class="cx"> #import "WKWebProcessPlugInScriptWorldInternal.h"
</span><span class="cx"> #import "WKWebsiteDataRecordInternal.h"
</span><ins>+#import "WKWebsiteDataStoreInternal.h"
</ins><span class="cx"> #import "_WKDownloadInternal.h"
</span><span class="cx"> #import "_WKFrameHandleInternal.h"
</span><span class="cx"> #import "_WKProcessPoolConfigurationInternal.h"
</span><span class="cx"> #import "_WKUserContentExtensionStoreInternal.h"
</span><span class="cx"> #import "_WKUserContentFilterInternal.h"
</span><span class="cx"> #import "_WKVisitedLinkProviderInternal.h"
</span><del>-#import "_WKWebsiteDataStoreInternal.h"
</del><span class="cx"> #import <objc/objc-auto.h>
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case Type::WebsiteDataStore:
</span><del>- wrapper = [_WKWebsiteDataStore alloc];
</del><ins>+ wrapper = [WKWebsiteDataStore alloc];
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case Type::BundleFrame:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (182872 => 182873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-04-16 00:15:11 UTC (rev 182872)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-04-16 00:45:24 UTC (rev 182873)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx"> #import "WKUserContentControllerInternal.h"
</span><span class="cx"> #import "WKWebViewConfigurationInternal.h"
</span><span class="cx"> #import "WKWebViewContentProvider.h"
</span><ins>+#import "WKWebsiteDataStoreInternal.h"
</ins><span class="cx"> #import "WebBackForwardList.h"
</span><span class="cx"> #import "WebCertificateInfo.h"
</span><span class="cx"> #import "WebFormSubmissionListenerProxy.h"
</span><span class="lines">@@ -74,7 +75,6 @@
</span><span class="cx"> #import "_WKRemoteObjectRegistryInternal.h"
</span><span class="cx"> #import "_WKSessionStateInternal.h"
</span><span class="cx"> #import "_WKVisitedLinkProviderInternal.h"
</span><del>-#import "_WKWebsiteDataStoreInternal.h"
</del><span class="cx"> #import <JavaScriptCore/JSContext.h>
</span><span class="cx"> #import <JavaScriptCore/JSValue.h>
</span><span class="cx"> #import <WebCore/IOSurface.h>
</span><span class="lines">@@ -291,7 +291,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.websiteDataStore = &[_configuration _websiteDataStore]->_websiteDataStore->websiteDataStore();
</del><ins>+ webPageConfiguration.websiteDataStore = &((WKWebsiteDataStore *)[_configuration _websiteDataStore])->_websiteDataStore->websiteDataStore();
</ins><span class="cx"> webPageConfiguration.sessionID = webPageConfiguration.websiteDataStore->sessionID();
</span><span class="cx"> webPageConfiguration.treatsSHA1SignedCertificatesAsInsecure = [_configuration _treatsSHA1SignedCertificatesAsInsecure];
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (182872 => 182873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2015-04-16 00:15:11 UTC (rev 182872)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2015-04-16 00:45:24 UTC (rev 182873)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> LazyInitialized<RetainPtr<WKPreferences>> _preferences;
</span><span class="cx"> LazyInitialized<RetainPtr<WKUserContentController>> _userContentController;
</span><span class="cx"> LazyInitialized<RetainPtr<_WKVisitedLinkProvider>> _visitedLinkProvider;
</span><del>- LazyInitialized<RetainPtr<_WKWebsiteDataStore>> _websiteDataStore;
</del><ins>+ LazyInitialized<RetainPtr<WKWebsiteDataStore>> _websiteDataStore;
</ins><span class="cx"> WebKit::WeakObjCPtr<WKWebView> _relatedWebView;
</span><span class="cx"> WebKit::WeakObjCPtr<WKWebView> _alternateWebViewForNavigationGestures;
</span><span class="cx"> BOOL _treatsSHA1SignedCertificatesAsInsecure;
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx">
</span><span class="cx"> - (_WKWebsiteDataStore *)_websiteDataStore
</span><span class="cx"> {
</span><del>- return _websiteDataStore.get([] { return [_WKWebsiteDataStore defaultDataStore]; });
</del><ins>+ return (_WKWebsiteDataStore *)_websiteDataStore.get([] { return [WKWebsiteDataStore defaultDataStore]; });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_setWebsiteDataStore:(_WKWebsiteDataStore *)websiteDataStore
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStorehfromrev182872trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoreh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h (from rev 182872, trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h) (0 => 182873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h 2015-04-16 00:45:24 UTC (rev 182873)
</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.
+ */
+
+#import <WebKit/WKFoundation.h>
+
+#if WK_API_ENABLED
+
+#import <WebKit/WKWebsiteDataRecord.h>
+
+WK_ASSUME_NONNULL_BEGIN
+
+WK_CLASS_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA)
+@interface WKWebsiteDataStore : NSObject
+
+// Returns the shared default data store.
++ (WKWebsiteDataStore *)defaultDataStore;
+
+// Returns a new non-persistent data store.
++ (WKWebsiteDataStore *)nonPersistentDataStore;
+
+- (instancetype)init WK_UNAVAILABLE;
+
+@property (readonly, getter=isNonPersistent) BOOL nonPersistent;
+
+- (void)fetchDataRecordsOfTypes:(WKWebsiteDataTypes)websiteDataTypes completionHandler:(void (^)(NSArray *))completionHandler;
+- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes forDataRecords:(NSArray *)dataRecords completionHandler:(void (^)())completionHandler;
+- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)())completionHandler;
+
+@end
+
+WK_ASSUME_NONNULL_END
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStoremmfromrev182872trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoremm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (from rev 182872, trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm) (0 => 182873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2015-04-16 00:45:24 UTC (rev 182873)
</span><span class="lines">@@ -0,0 +1,121 @@
</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.
+ */
+
+#import "config.h"
+#import "WKWebsiteDataStoreInternal.h"
+
+#if WK_API_ENABLED
+
+#import "WKNSArray.h"
+#import "WKWebsiteDataRecordInternal.h"
+
+@implementation WKWebsiteDataStore
+
++ (WKWebsiteDataStore *)defaultDataStore
+{
+ return WebKit::wrapper(*API::WebsiteDataStore::defaultDataStore().get());
+}
+
++ (WKWebsiteDataStore *)nonPersistentDataStore
+{
+ return [WebKit::wrapper(*API::WebsiteDataStore::createNonPersistentDataStore().release().leakRef()) autorelease];
+}
+
+- (void)dealloc
+{
+ _websiteDataStore->API::WebsiteDataStore::~WebsiteDataStore();
+
+ [super dealloc];
+}
+
+- (BOOL)isNonPersistent
+{
+ return _websiteDataStore->isNonPersistent();
+}
+
+static std::chrono::system_clock::time_point toSystemClockTime(NSDate *date)
+{
+ ASSERT(date);
+ using namespace std::chrono;
+
+ return system_clock::time_point(duration_cast<system_clock::duration>(duration<double>(date.timeIntervalSince1970)));
+}
+
+- (void)fetchDataRecordsOfTypes:(WKWebsiteDataTypes)websiteDataTypes completionHandler:(void (^)(NSArray *))completionHandler
+{
+ auto completionHandlerCopy = Block_copy(completionHandler);
+
+ _websiteDataStore->websiteDataStore().fetchData(WebKit::toWebsiteDataTypes(websiteDataTypes), [completionHandlerCopy](Vector<WebKit::WebsiteDataRecord> websiteDataRecords) {
+ Vector<RefPtr<API::Object>> elements;
+ elements.reserveInitialCapacity(websiteDataRecords.size());
+
+ for (auto& websiteDataRecord : websiteDataRecords)
+ elements.uncheckedAppend(API::WebsiteDataRecord::create(WTF::move(websiteDataRecord)));
+
+ completionHandlerCopy(wrapper(*API::Array::create(WTF::move(elements))));
+
+ Block_release(completionHandlerCopy);
+ });
+}
+
+- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)())completionHandler
+{
+ auto completionHandlerCopy = Block_copy(completionHandler);
+ _websiteDataStore->websiteDataStore().removeData(WebKit::toWebsiteDataTypes(websiteDataTypes), toSystemClockTime(date ? date : [NSDate distantPast]), [completionHandlerCopy] {
+ completionHandlerCopy();
+ Block_release(completionHandlerCopy);
+ });
+}
+
+static Vector<WebKit::WebsiteDataRecord> toWebsiteDataRecords(NSArray *dataRecords)
+{
+ Vector<WebKit::WebsiteDataRecord> result;
+
+ for (WKWebsiteDataRecord *dataRecord in dataRecords)
+ result.append(dataRecord->_websiteDataRecord->websiteDataRecord());
+
+ return result;
+}
+
+- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes forDataRecords:(NSArray *)dataRecords completionHandler:(void (^)())completionHandler
+{
+ auto completionHandlerCopy = Block_copy(completionHandler);
+
+ _websiteDataStore->websiteDataStore().removeData(WebKit::toWebsiteDataTypes(websiteDataTypes), toWebsiteDataRecords(dataRecords), [completionHandlerCopy] {
+ completionHandlerCopy();
+ Block_release(completionHandlerCopy);
+ });
+}
+
+#pragma mark WKObject protocol implementation
+
+- (API::Object&)_apiObject
+{
+ return *_websiteDataStore;
+}
+
+@end
+
+#endif // WK_API_ENABLED
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStoreInternalhfromrev182872trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoreInternalh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStoreInternal.h (from rev 182872, trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreInternal.h) (0 => 182873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStoreInternal.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStoreInternal.h 2015-04-16 00:45:24 UTC (rev 182873)
</span><span class="lines">@@ -0,0 +1,49 @@
</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.
+ */
+
+#import "WKWebsiteDataStore.h"
+
+#if WK_API_ENABLED
+
+#import "APIWebsiteDataStore.h"
+#import "WKObject.h"
+
+namespace WebKit {
+
+inline WKWebsiteDataStore *wrapper(API::WebsiteDataStore& websiteDataStore)
+{
+ ASSERT([websiteDataStore.wrapper() isKindOfClass:[WKWebsiteDataStore class]]);
+ return (WKWebsiteDataStore *)websiteDataStore.wrapper();
+}
+
+}
+
+@interface WKWebsiteDataStore () <WKObject> {
+@package
+ API::ObjectStorage<API::WebsiteDataStore> _websiteDataStore;
+}
+@end
+
+#endif // WK_API_ENABLED
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h (182872 => 182873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h 2015-04-16 00:15:11 UTC (rev 182872)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h 2015-04-16 00:45:24 UTC (rev 182873)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -27,23 +27,14 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import <WebKit/_WKWebsiteDataRecord.h>
</del><ins>+#import <WebKit/WKWebsiteDataStore.h>
</ins><span class="cx">
</span><span class="cx"> WK_CLASS_AVAILABLE(10_10, 8_0)
</span><del>-@interface _WKWebsiteDataStore : NSObject
</del><ins>+@interface _WKWebsiteDataStore : WKWebsiteDataStore
</ins><span class="cx">
</span><del>-// Returns the shared default data store.
-+ (instancetype)defaultDataStore;
</del><ins>++ (_WKWebsiteDataStore *)defaultDataStore;
++ (_WKWebsiteDataStore *)nonPersistentDataStore;
</ins><span class="cx">
</span><del>-// Returns a new non-persistent data store.
-+ (instancetype)nonPersistentDataStore;
-
-@property (readonly, getter=isNonPersistent) BOOL nonPersistent;
-
-- (void)fetchDataRecordsOfTypes:(WKWebsiteDataTypes)websiteDataTypes completionHandler:(void (^)(NSArray *))completionHandler WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes forDataRecords:(NSArray *)dataRecords completionHandler:(void (^)())completionHandler WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)())completionHandler WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-
</del><span class="cx"> @end
</span><span class="cx">
</span><del>-#endif // WK_API_ENABLED
</del><ins>+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm (182872 => 182873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm 2015-04-16 00:15:11 UTC (rev 182872)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm 2015-04-16 00:45:24 UTC (rev 182873)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -24,99 +24,22 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import "config.h"
</span><del>-#import "_WKWebsiteDataStoreInternal.h"
</del><ins>+#import "_WKWebsiteDataStore.h"
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import "APIArray.h"
-#import "WKNSArray.h"
-#import "WKWebsiteDataRecordInternal.h"
-
</del><span class="cx"> @implementation _WKWebsiteDataStore
</span><span class="cx">
</span><del>-+ (instancetype)defaultDataStore
</del><ins>++ (_WKWebsiteDataStore *)defaultDataStore
</ins><span class="cx"> {
</span><del>- return WebKit::wrapper(*API::WebsiteDataStore::defaultDataStore().get());
</del><ins>+ return (_WKWebsiteDataStore *)[WKWebsiteDataStore defaultDataStore];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-+ (instancetype)nonPersistentDataStore
</del><ins>++ (_WKWebsiteDataStore *)nonPersistentDataStore
</ins><span class="cx"> {
</span><del>- return [WebKit::wrapper(*API::WebsiteDataStore::createNonPersistentDataStore().release().leakRef()) autorelease];
</del><ins>+ return (_WKWebsiteDataStore *)[WKWebsiteDataStore nonPersistentDataStore];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)dealloc
-{
- _websiteDataStore->API::WebsiteDataStore::~WebsiteDataStore();
-
- [super dealloc];
-}
-
-- (BOOL)isNonPersistent
-{
- return _websiteDataStore->isNonPersistent();
-}
-
-static std::chrono::system_clock::time_point toSystemClockTime(NSDate *date)
-{
- ASSERT(date);
- using namespace std::chrono;
-
- return system_clock::time_point(duration_cast<system_clock::duration>(duration<double>(date.timeIntervalSince1970)));
-}
-
-- (void)fetchDataRecordsOfTypes:(WKWebsiteDataTypes)websiteDataTypes completionHandler:(void (^)(NSArray *))completionHandler
-{
- auto completionHandlerCopy = Block_copy(completionHandler);
-
- _websiteDataStore->websiteDataStore().fetchData(WebKit::toWebsiteDataTypes(websiteDataTypes), [completionHandlerCopy](Vector<WebKit::WebsiteDataRecord> websiteDataRecords) {
- Vector<RefPtr<API::Object>> elements;
- elements.reserveInitialCapacity(websiteDataRecords.size());
-
- for (auto& websiteDataRecord : websiteDataRecords)
- elements.uncheckedAppend(API::WebsiteDataRecord::create(WTF::move(websiteDataRecord)));
-
- completionHandlerCopy(wrapper(*API::Array::create(WTF::move(elements))));
-
- Block_release(completionHandlerCopy);
- });
-}
-
-- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)())completionHandler
-{
- auto completionHandlerCopy = Block_copy(completionHandler);
- _websiteDataStore->websiteDataStore().removeData(WebKit::toWebsiteDataTypes(websiteDataTypes), toSystemClockTime(date ? date : [NSDate distantPast]), [completionHandlerCopy] {
- completionHandlerCopy();
- Block_release(completionHandlerCopy);
- });
-}
-
-static Vector<WebKit::WebsiteDataRecord> toWebsiteDataRecords(NSArray *dataRecords)
-{
- Vector<WebKit::WebsiteDataRecord> result;
-
- for (WKWebsiteDataRecord *dataRecord in dataRecords)
- result.append(dataRecord->_websiteDataRecord->websiteDataRecord());
-
- return result;
-}
-
-- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes forDataRecords:(NSArray *)dataRecords completionHandler:(void (^)())completionHandler
-{
- auto completionHandlerCopy = Block_copy(completionHandler);
-
- _websiteDataStore->websiteDataStore().removeData(WebKit::toWebsiteDataTypes(websiteDataTypes), toWebsiteDataRecords(dataRecords), [completionHandlerCopy] {
- completionHandlerCopy();
- Block_release(completionHandlerCopy);
- });
-}
-
-#pragma mark WKObject protocol implementation
-
-- (API::Object&)_apiObject
-{
- return *_websiteDataStore;
-}
-
</del><span class="cx"> @end
</span><span class="cx">
</span><del>-#endif // WK_API_ENABLED
</del><ins>+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoreInternalh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreInternal.h (182872 => 182873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreInternal.h 2015-04-16 00:15:11 UTC (rev 182872)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreInternal.h 2015-04-16 00:45:24 UTC (rev 182873)
</span><span class="lines">@@ -1,49 +0,0 @@
</span><del>-/*
- * 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.
- */
-
-#import "_WKWebsiteDataStore.h"
-
-#if WK_API_ENABLED
-
-#import "APIWebsiteDataStore.h"
-#import "WKObject.h"
-
-namespace WebKit {
-
-inline _WKWebsiteDataStore *wrapper(API::WebsiteDataStore& websiteDataStore)
-{
- ASSERT([websiteDataStore.wrapper() isKindOfClass:[_WKWebsiteDataStore class]]);
- return (_WKWebsiteDataStore *)websiteDataStore.wrapper();
-}
-
-}
-
-@interface _WKWebsiteDataStore () <WKObject> {
-@package
- API::ObjectStorage<API::WebsiteDataStore> _websiteDataStore;
-}
-@end
-
-#endif // WK_API_ENABLED
</del></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (182872 => 182873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-04-16 00:15:11 UTC (rev 182872)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-04-16 00:45:24 UTC (rev 182873)
</span><span class="lines">@@ -503,6 +503,8 @@
</span><span class="cx"> 1AFA4B8F1A65A9E2006C4AB4 /* WebProcessLifetimeObserver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFA4B8D1A65A9E2006C4AB4 /* WebProcessLifetimeObserver.cpp */; };
</span><span class="cx"> 1AFA4B901A65A9E2006C4AB4 /* WebProcessLifetimeObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFA4B8E1A65A9E2006C4AB4 /* WebProcessLifetimeObserver.h */; };
</span><span class="cx"> 1AFB4C6E1ADF0C7800B33339 /* _WKWebsiteDataRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFB4C6C1ADF0C7800B33339 /* _WKWebsiteDataRecord.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 1AFB4C711ADF155D00B33339 /* _WKWebsiteDataStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AFB4C6F1ADF155D00B33339 /* _WKWebsiteDataStore.mm */; };
+ 1AFB4C721ADF155D00B33339 /* _WKWebsiteDataStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFB4C701ADF155D00B33339 /* _WKWebsiteDataStore.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 1AFDD3151891B54000153970 /* APIPolicyClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFDD3141891B54000153970 /* APIPolicyClient.h */; };
</span><span class="cx"> 1AFDD3171891C94700153970 /* WKPreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFDD3161891C94700153970 /* WKPreferences.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><span class="cx"> 1AFDD3191891CA1200153970 /* WKPreferences.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AFDD3181891CA1200153970 /* WKPreferences.mm */; };
</span><span class="lines">@@ -1077,9 +1079,9 @@
</span><span class="cx"> 755422CB180650020046F6A8 /* WebOriginDataManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 755422C618064FFC0046F6A8 /* WebOriginDataManager.cpp */; };
</span><span class="cx"> 755422CC180773CE0046F6A8 /* WebOriginDataManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 755422C718064FFC0046F6A8 /* WebOriginDataManager.h */; };
</span><span class="cx"> 759CCD5A1808F6160078E8A8 /* WebOriginDataManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 755422BF18062BE40046F6A8 /* WebOriginDataManagerProxy.h */; };
</span><del>- 75A8D2C8187CCFAB00C39C9E /* _WKWebsiteDataStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 75A8D2C4187CCF9F00C39C9E /* _WKWebsiteDataStore.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 75A8D2C9187CCFAF00C39C9E /* _WKWebsiteDataStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 75A8D2C5187CCF9F00C39C9E /* _WKWebsiteDataStore.mm */; };
- 75A8D2D6187D1C0E00C39C9E /* _WKWebsiteDataStoreInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 75A8D2D4187D1C0100C39C9E /* _WKWebsiteDataStoreInternal.h */; };
</del><ins>+ 75A8D2C8187CCFAB00C39C9E /* WKWebsiteDataStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 75A8D2C4187CCF9F00C39C9E /* WKWebsiteDataStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 75A8D2C9187CCFAF00C39C9E /* WKWebsiteDataStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 75A8D2C5187CCF9F00C39C9E /* WKWebsiteDataStore.mm */; };
+ 75A8D2D6187D1C0E00C39C9E /* WKWebsiteDataStoreInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 75A8D2D4187D1C0100C39C9E /* WKWebsiteDataStoreInternal.h */; };
</ins><span class="cx"> 75A8D2D7187D303A00C39C9E /* WKSessionRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 75A8D2D1187D17BF00C39C9E /* WKSessionRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 75A8D2D8187D304000C39C9E /* WKSessionRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75A8D2D0187D17BF00C39C9E /* WKSessionRef.cpp */; };
</span><span class="cx"> 75A8D2E1187DEC1A00C39C9E /* APISession.h in Headers */ = {isa = PBXBuildFile; fileRef = 75A8D2DE187DE87400C39C9E /* APISession.h */; };
</span><span class="lines">@@ -2653,6 +2655,8 @@
</span><span class="cx"> 1AFA4B8D1A65A9E2006C4AB4 /* WebProcessLifetimeObserver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebProcessLifetimeObserver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1AFA4B8E1A65A9E2006C4AB4 /* WebProcessLifetimeObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebProcessLifetimeObserver.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AFB4C6C1ADF0C7800B33339 /* _WKWebsiteDataRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKWebsiteDataRecord.h; sourceTree = "<group>"; };
</span><ins>+ 1AFB4C6F1ADF155D00B33339 /* _WKWebsiteDataStore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKWebsiteDataStore.mm; sourceTree = "<group>"; };
+ 1AFB4C701ADF155D00B33339 /* _WKWebsiteDataStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKWebsiteDataStore.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1AFDD3141891B54000153970 /* APIPolicyClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIPolicyClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AFDD3161891C94700153970 /* WKPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferences.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AFDD3181891CA1200153970 /* WKPreferences.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKPreferences.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -3294,11 +3298,11 @@
</span><span class="cx"> 755422C618064FFC0046F6A8 /* WebOriginDataManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebOriginDataManager.cpp; path = OriginData/WebOriginDataManager.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 755422C718064FFC0046F6A8 /* WebOriginDataManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebOriginDataManager.h; path = OriginData/WebOriginDataManager.h; sourceTree = "<group>"; };
</span><span class="cx"> 755422C818064FFC0046F6A8 /* WebOriginDataManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebOriginDataManager.messages.in; path = OriginData/WebOriginDataManager.messages.in; sourceTree = "<group>"; };
</span><del>- 75A8D2C4187CCF9F00C39C9E /* _WKWebsiteDataStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKWebsiteDataStore.h; sourceTree = "<group>"; };
- 75A8D2C5187CCF9F00C39C9E /* _WKWebsiteDataStore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKWebsiteDataStore.mm; sourceTree = "<group>"; };
</del><ins>+ 75A8D2C4187CCF9F00C39C9E /* WKWebsiteDataStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebsiteDataStore.h; sourceTree = "<group>"; };
+ 75A8D2C5187CCF9F00C39C9E /* WKWebsiteDataStore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebsiteDataStore.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 75A8D2D0187D17BF00C39C9E /* WKSessionRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKSessionRef.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 75A8D2D1187D17BF00C39C9E /* WKSessionRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSessionRef.h; sourceTree = "<group>"; };
</span><del>- 75A8D2D4187D1C0100C39C9E /* _WKWebsiteDataStoreInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKWebsiteDataStoreInternal.h; sourceTree = "<group>"; };
</del><ins>+ 75A8D2D4187D1C0100C39C9E /* WKWebsiteDataStoreInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebsiteDataStoreInternal.h; sourceTree = "<group>"; };
</ins><span class="cx"> 75A8D2DD187DE87400C39C9E /* APISession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = APISession.cpp; path = UIProcess/API/APISession.cpp; sourceTree = SOURCE_ROOT; };
</span><span class="cx"> 75A8D2DE187DE87400C39C9E /* APISession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = APISession.h; path = UIProcess/API/APISession.h; sourceTree = SOURCE_ROOT; };
</span><span class="cx"> 75E749E5180DBB9800088BA6 /* WebOriginDataManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebOriginDataManagerMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4445,6 +4449,8 @@
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="cx"> 1AFB4C6C1ADF0C7800B33339 /* _WKWebsiteDataRecord.h */,
</span><ins>+ 1AFB4C701ADF155D00B33339 /* _WKWebsiteDataStore.h */,
+ 1AFB4C6F1ADF155D00B33339 /* _WKWebsiteDataStore.mm */,
</ins><span class="cx"> BC59548815C7868500FD1E3E /* WebKit2.h */,
</span><span class="cx"> BCBAAC6C144E61910053F82F /* WKBrowsingContextController.h */,
</span><span class="cx"> BCBAAC6D144E61920053F82F /* WKBrowsingContextController.mm */,
</span><span class="lines">@@ -5387,9 +5393,6 @@
</span><span class="cx"> 1A81B37F18BD66AD0007FDAC /* _WKVisitedLinkProvider.h */,
</span><span class="cx"> 1A81B37E18BD66AD0007FDAC /* _WKVisitedLinkProvider.mm */,
</span><span class="cx"> 1A81B38418BD673A0007FDAC /* _WKVisitedLinkProviderInternal.h */,
</span><del>- 75A8D2C4187CCF9F00C39C9E /* _WKWebsiteDataStore.h */,
- 75A8D2C5187CCF9F00C39C9E /* _WKWebsiteDataStore.mm */,
- 75A8D2D4187D1C0100C39C9E /* _WKWebsiteDataStoreInternal.h */,
</del><span class="cx"> 7CEFA9601AC0999300B910FD /* APIUserContentExtensionStoreCocoa.mm */,
</span><span class="cx"> 1A3635AB1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm */,
</span><span class="cx"> 1AFDE64319510B5500C48FFA /* LegacyBundleForClass.mm */,
</span><span class="lines">@@ -5446,6 +5449,9 @@
</span><span class="cx"> 1A4832CA1A9BC465008B4DFE /* WKWebsiteDataRecord.h */,
</span><span class="cx"> 1A4832C91A9BC465008B4DFE /* WKWebsiteDataRecord.mm */,
</span><span class="cx"> 1A4832CD1A9BC484008B4DFE /* WKWebsiteDataRecordInternal.h */,
</span><ins>+ 75A8D2C4187CCF9F00C39C9E /* WKWebsiteDataStore.h */,
+ 75A8D2C5187CCF9F00C39C9E /* WKWebsiteDataStore.mm */,
+ 75A8D2D4187D1C0100C39C9E /* WKWebsiteDataStoreInternal.h */,
</ins><span class="cx"> 1A3CC16518906ACF001E6ED8 /* WKWebView.h */,
</span><span class="cx"> 1A3CC16418906ACF001E6ED8 /* WKWebView.mm */,
</span><span class="cx"> 1ADF59191890528E0043C145 /* WKWebViewConfiguration.h */,
</span><span class="lines">@@ -7625,8 +7631,8 @@
</span><span class="cx"> 1A81B38118BD66AD0007FDAC /* _WKVisitedLinkProvider.h in Headers */,
</span><span class="cx"> 1A81B38518BD673A0007FDAC /* _WKVisitedLinkProviderInternal.h in Headers */,
</span><span class="cx"> 1AFB4C6E1ADF0C7800B33339 /* _WKWebsiteDataRecord.h in Headers */,
</span><del>- 75A8D2C8187CCFAB00C39C9E /* _WKWebsiteDataStore.h in Headers */,
- 75A8D2D6187D1C0E00C39C9E /* _WKWebsiteDataStoreInternal.h in Headers */,
</del><ins>+ 75A8D2C8187CCFAB00C39C9E /* WKWebsiteDataStore.h in Headers */,
+ 75A8D2D6187D1C0E00C39C9E /* WKWebsiteDataStoreInternal.h in Headers */,
</ins><span class="cx"> A115DC72191D82DA00DA8072 /* _WKWebViewPrintFormatter.h in Headers */,
</span><span class="cx"> A7D792D81767CCA300881CBE /* ActivityAssertion.h in Headers */,
</span><span class="cx"> BC64697011DBE603006455B0 /* APIArray.h in Headers */,
</span><span class="lines">@@ -7910,6 +7916,7 @@
</span><span class="cx"> 1AA3D75C1651B44F008713D0 /* RemoteLayerTreeHost.h in Headers */,
</span><span class="cx"> 2DDE0AFA18298CC900F97EAA /* RemoteLayerTreePropertyApplier.h in Headers */,
</span><span class="cx"> 0FF264A01A1FF9CC001FE759 /* RemoteLayerTreeScrollingPerformanceData.h in Headers */,
</span><ins>+ 1AFB4C721ADF155D00B33339 /* _WKWebsiteDataStore.h in Headers */,
</ins><span class="cx"> 1AF1AC6C1651759E00C17D7F /* RemoteLayerTreeTransaction.h in Headers */,
</span><span class="cx"> E1B78471163F24690007B692 /* RemoteNetworkingContext.h in Headers */,
</span><span class="cx"> 1AC1338018590AE400F3EC05 /* RemoteObjectRegistry.h in Headers */,
</span><span class="lines">@@ -9405,7 +9412,7 @@
</span><span class="cx"> 7C2413021AACFA7500A58C15 /* _WKUserContentExtensionStore.mm in Sources */,
</span><span class="cx"> 7C89D2B91A6B0F2C003A5FDE /* _WKUserContentFilter.mm in Sources */,
</span><span class="cx"> 1A81B38018BD66AD0007FDAC /* _WKVisitedLinkProvider.mm in Sources */,
</span><del>- 75A8D2C9187CCFAF00C39C9E /* _WKWebsiteDataStore.mm in Sources */,
</del><ins>+ 75A8D2C9187CCFAF00C39C9E /* WKWebsiteDataStore.mm in Sources */,
</ins><span class="cx"> A115DC71191D82D700DA8072 /* _WKWebViewPrintFormatter.mm in Sources */,
</span><span class="cx"> A7D792D61767CB6E00881CBE /* ActivityAssertion.cpp in Sources */,
</span><span class="cx"> BC64696F11DBE603006455B0 /* APIArray.cpp in Sources */,
</span><span class="lines">@@ -9904,6 +9911,7 @@
</span><span class="cx"> 8372DB281A67562800C697C5 /* WebPageDiagnosticLoggingClient.cpp in Sources */,
</span><span class="cx"> BC7B6207129A0A6700D174A4 /* WebPageGroup.cpp in Sources */,
</span><span class="cx"> BC7B625312A43C9600D174A4 /* WebPageGroupData.cpp in Sources */,
</span><ins>+ 1AFB4C711ADF155D00B33339 /* _WKWebsiteDataStore.mm in Sources */,
</ins><span class="cx"> BC7B621612A4219A00D174A4 /* WebPageGroupProxy.cpp in Sources */,
</span><span class="cx"> 29D55DF1161BF9F10031A2E3 /* WebPageGroupProxyMessageReceiver.cpp in Sources */,
</span><span class="cx"> 2D9EA3111A96D9EB002D2807 /* WebPageInjectedBundleClient.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>