<!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>[182930] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/182930">182930</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-04-16 17:46:07 -0700 (Thu, 16 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Deprecate _WKWebsiteDataStore in favor of WKWebsiteDataStore
https://bugs.webkit.org/show_bug.cgi?id=143844
Reviewed by Dan Bernstein.
Source/WebKit2:
* Shared/API/Cocoa/WKFoundation.h:
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration _validate]):
* UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
* UIProcess/API/Cocoa/_WKWebsiteDataRecord.h:
* UIProcess/API/Cocoa/_WKWebsiteDataStore.h:
* mac/postprocess-framework-headers.sh:
Tools:
* MiniBrowser/mac/AppDelegate.m:
(-[BrowserAppDelegate newPrivateWindow:]):
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController initWithConfiguration:]):
(-[WK2BrowserWindowController fetchWebsiteData:]):
(-[WK2BrowserWindowController fetchAndClearWebsiteData:]):
(-[WK2BrowserWindowController clearWebsiteData:]):</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="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataRecordh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecord.h</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="#trunkSourceWebKit2macpostprocessframeworkheaderssh">trunk/Source/WebKit2/mac/postprocess-framework-headers.sh</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacAppDelegatem">trunk/Tools/MiniBrowser/mac/AppDelegate.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182929 => 182930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-17 00:44:58 UTC (rev 182929)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-17 00:46:07 UTC (rev 182930)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-04-16 Anders Carlsson <andersca@apple.com>
+
+ Deprecate _WKWebsiteDataStore in favor of WKWebsiteDataStore
+ https://bugs.webkit.org/show_bug.cgi?id=143844
+
+ Reviewed by Dan Bernstein.
+
+ * Shared/API/Cocoa/WKFoundation.h:
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration _validate]):
+ * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+ * UIProcess/API/Cocoa/_WKWebsiteDataRecord.h:
+ * UIProcess/API/Cocoa/_WKWebsiteDataStore.h:
+ * mac/postprocess-framework-headers.sh:
+
</ins><span class="cx"> 2015-04-16 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Removed unused WKUserContentFilterRef.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoaWKFoundationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h (182929 => 182930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2015-04-17 00:44:58 UTC (rev 182929)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2015-04-17 00:46:07 UTC (rev 182930)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> #define WK_AVAILABLE(_mac, _ios)
</span><span class="cx"> #define WK_CLASS_AVAILABLE(_mac, _ios) __attribute__((visibility ("default")))
</span><span class="cx"> #define WK_DEPRECATED(_macIntro, _macDep, _iosIntro, _iosDep, ...) __attribute__((deprecated(__VA_ARGS__)))
</span><ins>+#define WK_CLASS_DEPRECATED(_macIntro, _macDep, _iosIntro, _iosDep, ...) __attribute__((visibility("default"))) __attribute__((deprecated(__VA_ARGS__)))
</ins><span class="cx"> #define WK_ENUM_AVAILABLE(_mac, _ios)
</span><span class="cx"> #define WK_ENUM_AVAILABLE_IOS(_ios)
</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 (182929 => 182930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2015-04-17 00:44:58 UTC (rev 182929)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2015-04-17 00:46:07 UTC (rev 182930)
</span><span class="lines">@@ -215,6 +215,9 @@
</span><span class="cx"> _visitedLinkProvider.set(visitedLinkProvider);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
</ins><span class="cx"> - (_WKWebsiteDataStore *)_websiteDataStore
</span><span class="cx"> {
</span><span class="cx"> return (_WKWebsiteDataStore *)self.websiteDataStore;
</span><span class="lines">@@ -225,6 +228,8 @@
</span><span class="cx"> self.websiteDataStore = websiteDataStore;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#pragma clang diagnostic pop
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> - (WKWebViewContentProviderRegistry *)_contentProviderRegistry
</span><span class="cx"> {
</span><span class="lines">@@ -248,12 +253,12 @@
</span><span class="cx"> if (!self.userContentController)
</span><span class="cx"> [NSException raise:NSInvalidArgumentException format:@"configuration.userContentController is nil"];
</span><span class="cx">
</span><ins>+ if (!self.websiteDataStore)
+ [NSException raise:NSInvalidArgumentException format:@"configuration.websiteDataStore is nil"];
+
</ins><span class="cx"> if (!self._visitedLinkProvider)
</span><span class="cx"> [NSException raise:NSInvalidArgumentException format:@"configuration._visitedLinkProvider is nil"];
</span><span class="cx">
</span><del>- if (!self._websiteDataStore)
- [NSException raise:NSInvalidArgumentException format:@"configuration._websiteDataStore is nil"];
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (!self._contentProviderRegistry)
</span><span class="cx"> [NSException raise:NSInvalidArgumentException format:@"configuration._contentProviderRegistry is nil"];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (182929 => 182930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2015-04-17 00:44:58 UTC (rev 182929)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2015-04-17 00:46:07 UTC (rev 182930)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, strong, setter=_setVisitedLinkProvider:) _WKVisitedLinkProvider *_visitedLinkProvider;
</span><span class="cx">
</span><del>-@property (nonatomic, strong, setter=_setWebsiteDataStore:) _WKWebsiteDataStore *_websiteDataStore;
</del><ins>+@property (nonatomic, strong, setter=_setWebsiteDataStore:) _WKWebsiteDataStore *_websiteDataStore WK_DEPRECATED(10_10, WK_MAC_TBA, 8_0, WK_IOS_TBA, "Please use websiteDataStore instead");
</ins><span class="cx">
</span><span class="cx"> @property (nonatomic, weak, setter=_setAlternateWebViewForNavigationGestures:) WKWebView *_alternateWebViewForNavigationGestures;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataRecordh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecord.h (182929 => 182930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecord.h 2015-04-17 00:44:58 UTC (rev 182929)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecord.h 2015-04-17 00:46:07 UTC (rev 182930)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #import <WebKit/WKWebsiteDataRecord.h>
</span><span class="cx">
</span><del>-WK_CLASS_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA)
</del><ins>+WK_CLASS_DEPRECATED(WK_MAC_TBA, WK_MAC_TBA, WK_IOS_TBA, WK_IOS_TBA, "Please use WKWebsiteDataRecord instead")
</ins><span class="cx"> @interface _WKWebsiteDataRecord : WKWebsiteDataRecord
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h (182929 => 182930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h 2015-04-17 00:44:58 UTC (rev 182929)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h 2015-04-17 00:46:07 UTC (rev 182930)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #import <WebKit/WKWebsiteDataStore.h>
</span><span class="cx">
</span><del>-WK_CLASS_AVAILABLE(10_10, 8_0)
</del><ins>+WK_CLASS_DEPRECATED(10_10, WK_MAC_TBA, 8_0, WK_IOS_TBA, "Please use WKWebsiteDataStore instead")
</ins><span class="cx"> @interface _WKWebsiteDataStore : WKWebsiteDataStore
</span><span class="cx">
</span><span class="cx"> + (_WKWebsiteDataStore *)defaultDataStore;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm (182929 => 182930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm 2015-04-17 00:44:58 UTC (rev 182929)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm 2015-04-17 00:46:07 UTC (rev 182930)
</span><span class="lines">@@ -28,6 +28,9 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
</ins><span class="cx"> @implementation _WKWebsiteDataStore
</span><span class="cx">
</span><span class="cx"> + (_WKWebsiteDataStore *)defaultDataStore
</span><span class="lines">@@ -42,4 +45,6 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+#pragma clang diagnostic pop
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2macpostprocessframeworkheaderssh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/mac/postprocess-framework-headers.sh (182929 => 182930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/mac/postprocess-framework-headers.sh 2015-04-17 00:44:58 UTC (rev 182929)
+++ trunk/Source/WebKit2/mac/postprocess-framework-headers.sh 2015-04-17 00:46:07 UTC (rev 182930)
</span><span class="lines">@@ -50,10 +50,10 @@
</span><span class="cx"> if [[ -n "$OSX_VERSION" ]] && [[ -n "$IOS_VERSION" ]]; then
</span><span class="cx"> sed -i .tmp -e s/WK_MAC_TBA/${OSX_VERSION}/g -e s/WK_IOS_TBA/${IOS_VERSION}/g ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_
</span><span class="cx"> else
</span><del>- sed -i .tmp -E -e 's/WK_(CLASS_|ENUM_)?AVAILABLE(_IOS|_MAC)?\(.+\)//g' -e 's/WK_DEPRECATED\(.+\)//g' ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_
</del><ins>+ sed -i .tmp -E -e 's/WK_(CLASS_|ENUM_)?AVAILABLE(_IOS|_MAC)?\(.+\)//g' -e 's/WK_(CLASS_?)DEPRECATED\(.+\)//g' ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_
</ins><span class="cx"> fi
</span><span class="cx">
</span><del>- sed -i .tmp -e s/^WK_CLASS_AVAILABLE/NS_CLASS_AVAILABLE/ -e s/WK_AVAILABLE/NS_AVAILABLE/ -e s/WK_DEPRECATED/NS_DEPRECATED/ -e s/WK_DESIGNATED_INITIALIZER/NS_DESIGNATED_INITIALIZER/ -e s/WK_ENUM_AVAILABLE/NS_ENUM_AVAILABLE/ -e s/WK_UNAVAILABLE/NS_UNAVAILABLE/ -e s/WK_ASSUME_NONNULL_BEGIN/NS_ASSUME_NONNULL_BEGIN/ -e s/WK_ASSUME_NONNULL_END/NS_ASSUME_NONNULL_END/ -e s/WK_NULLABLE_PROPERTY/nullable,/ -e s/WK_NULLABLE_SPECIFIER/__nullable/g -e s/WK_NULLABLE/nullable/g -e s/WK_NULL_UNSPECIFIED/null_unspecified/ ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_
</del><ins>+ sed -i .tmp -e s/^WK_CLASS_AVAILABLE/NS_CLASS_AVAILABLE/ -e s/WK_AVAILABLE/NS_AVAILABLE/ -e s/^WK_CLASS_DEPRECATED/NS_CLASS_DEPRECATED/ -e s/WK_DEPRECATED/NS_DEPRECATED/ -e s/WK_DESIGNATED_INITIALIZER/NS_DESIGNATED_INITIALIZER/ -e s/WK_ENUM_AVAILABLE/NS_ENUM_AVAILABLE/ -e s/WK_UNAVAILABLE/NS_UNAVAILABLE/ -e s/WK_ASSUME_NONNULL_BEGIN/NS_ASSUME_NONNULL_BEGIN/ -e s/WK_ASSUME_NONNULL_END/NS_ASSUME_NONNULL_END/ -e s/WK_NULLABLE_PROPERTY/nullable,/ -e s/WK_NULLABLE_SPECIFIER/__nullable/g -e s/WK_NULLABLE/nullable/g -e s/WK_NULL_UNSPECIFIED/null_unspecified/ ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_
</ins><span class="cx"> mv ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} $HEADER_PATH
</span><span class="cx"> fi
</span><span class="cx"> done
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (182929 => 182930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-04-17 00:44:58 UTC (rev 182929)
+++ trunk/Tools/ChangeLog 2015-04-17 00:46:07 UTC (rev 182930)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-04-16 Anders Carlsson <andersca@apple.com>
+
+ Deprecate _WKWebsiteDataStore in favor of WKWebsiteDataStore
+ https://bugs.webkit.org/show_bug.cgi?id=143844
+
+ Reviewed by Dan Bernstein.
+
+ * MiniBrowser/mac/AppDelegate.m:
+ (-[BrowserAppDelegate newPrivateWindow:]):
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController initWithConfiguration:]):
+ (-[WK2BrowserWindowController fetchWebsiteData:]):
+ (-[WK2BrowserWindowController fetchAndClearWebsiteData:]):
+ (-[WK2BrowserWindowController clearWebsiteData:]):
+
</ins><span class="cx"> 2015-04-16 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> 32-bit build fix.
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacAppDelegatem"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.m (182929 => 182930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/AppDelegate.m 2015-04-17 00:44:58 UTC (rev 182929)
+++ trunk/Tools/MiniBrowser/mac/AppDelegate.m 2015-04-17 00:46:07 UTC (rev 182930)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #import <WebKit/WebKit.h>
</span><span class="cx"> #import <WebKit/_WKProcessPoolConfiguration.h>
</span><span class="cx"> #import <WebKit/_WKUserContentExtensionStore.h>
</span><del>-#import <WebKit/_WKWebsiteDataStore.h>
</del><span class="cx">
</span><span class="cx"> enum {
</span><span class="cx"> WebKit1NewWindowTag = 1,
</span><span class="lines">@@ -118,7 +117,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx"> WKWebViewConfiguration *privateConfiguraton = [defaultConfiguration() copy];
</span><del>- privateConfiguraton._websiteDataStore = [_WKWebsiteDataStore nonPersistentDataStore];
</del><ins>+ privateConfiguraton.websiteDataStore = [WKWebsiteDataStore nonPersistentDataStore];
</ins><span class="cx">
</span><span class="cx"> BrowserWindowController *controller = [[WK2BrowserWindowController alloc] initWithConfiguration:privateConfiguraton];
</span><span class="cx"> [privateConfiguraton release];
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (182929 => 182930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2015-04-17 00:44:58 UTC (rev 182929)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2015-04-17 00:46:07 UTC (rev 182930)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #import <WebKit/WKWebViewConfigurationPrivate.h>
</span><span class="cx"> #import <WebKit/WKWebViewPrivate.h>
</span><span class="cx"> #import <WebKit/WebNSURLExtras.h>
</span><del>-#import <WebKit/_WKWebsiteDataStore.h>
</del><span class="cx">
</span><span class="cx"> static void* keyValueObservingContext = &keyValueObservingContext;
</span><span class="cx">
</span><span class="lines">@@ -79,7 +78,7 @@
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> _configuration = [configuration copy];
</span><del>- _isPrivateBrowsingWindow = _configuration._websiteDataStore.isNonPersistent;
</del><ins>+ _isPrivateBrowsingWindow = _configuration.websiteDataStore.isNonPersistent;
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="lines">@@ -445,16 +444,16 @@
</span><span class="cx">
</span><span class="cx"> - (IBAction)fetchWebsiteData:(id)sender
</span><span class="cx"> {
</span><del>- [_configuration._websiteDataStore fetchDataRecordsOfTypes:dataTypes completionHandler:^(NSArray *websiteDataRecords) {
</del><ins>+ [_configuration.websiteDataStore fetchDataRecordsOfTypes:dataTypes completionHandler:^(NSArray *websiteDataRecords) {
</ins><span class="cx"> NSLog(@"did fetch website data %@.", websiteDataRecords);
</span><span class="cx"> }];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (IBAction)fetchAndClearWebsiteData:(id)sender
</span><span class="cx"> {
</span><del>- [_configuration._websiteDataStore fetchDataRecordsOfTypes:dataTypes completionHandler:^(NSArray *websiteDataRecords) {
- [_configuration._websiteDataStore removeDataOfTypes:dataTypes forDataRecords:websiteDataRecords completionHandler:^{
- [_configuration._websiteDataStore fetchDataRecordsOfTypes:dataTypes completionHandler:^(NSArray *websiteDataRecords) {
</del><ins>+ [_configuration.websiteDataStore fetchDataRecordsOfTypes:dataTypes completionHandler:^(NSArray *websiteDataRecords) {
+ [_configuration.websiteDataStore removeDataOfTypes:dataTypes forDataRecords:websiteDataRecords completionHandler:^{
+ [_configuration.websiteDataStore fetchDataRecordsOfTypes:dataTypes completionHandler:^(NSArray *websiteDataRecords) {
</ins><span class="cx"> NSLog(@"did clear website data, after clearing data is %@.", websiteDataRecords);
</span><span class="cx"> }];
</span><span class="cx"> }];
</span><span class="lines">@@ -463,7 +462,7 @@
</span><span class="cx">
</span><span class="cx"> - (IBAction)clearWebsiteData:(id)sender
</span><span class="cx"> {
</span><del>- [_configuration._websiteDataStore removeDataOfTypes:dataTypes modifiedSince:[NSDate distantPast] completionHandler:^{
</del><ins>+ [_configuration.websiteDataStore removeDataOfTypes:dataTypes modifiedSince:[NSDate distantPast] completionHandler:^{
</ins><span class="cx"> NSLog(@"Did clear website data.");
</span><span class="cx"> }];
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>