<!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>[182875] 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/182875">182875</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-04-15 19:25:28 -0700 (Wed, 15 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make websiteDataStore on WKWebViewConfiguration public
https://bugs.webkit.org/show_bug.cgi?id=143810
Reviewed by Dan Bernstein.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
* UIProcess/API/Cocoa/WKWebViewConfiguration.h:
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration copyWithZone:]):
(-[WKWebViewConfiguration websiteDataStore]):
(-[WKWebViewConfiguration setWebsiteDataStore:]):
(-[WKWebViewConfiguration _websiteDataStore]):
(-[WKWebViewConfiguration _setWebsiteDataStore:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182874 => 182875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-16 00:45:48 UTC (rev 182874)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-16 02:25:28 UTC (rev 182875)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2015-04-15 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Make websiteDataStore on WKWebViewConfiguration public
+ https://bugs.webkit.org/show_bug.cgi?id=143810
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.h:
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration copyWithZone:]):
+ (-[WKWebViewConfiguration websiteDataStore]):
+ (-[WKWebViewConfiguration setWebsiteDataStore:]):
+ (-[WKWebViewConfiguration _websiteDataStore]):
+ (-[WKWebViewConfiguration _setWebsiteDataStore:]):
+
+2015-04-15 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Make WKWebsiteDataStore public
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=143805
</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 (182874 => 182875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-04-16 00:45:48 UTC (rev 182874)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-04-16 02:25:28 UTC (rev 182875)
</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 = &((WKWebsiteDataStore *)[_configuration _websiteDataStore])->_websiteDataStore->websiteDataStore();
</del><ins>+ webPageConfiguration.websiteDataStore = &[_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="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h (182874 => 182875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2015-04-16 00:45:48 UTC (rev 182874)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2015-04-16 02:25:28 UTC (rev 182875)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> @class WKPreferences;
</span><span class="cx"> @class WKProcessPool;
</span><span class="cx"> @class WKUserContentController;
</span><ins>+@class WKWebsiteDataStore;
</ins><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> /*! @enum WKSelectionGranularity
</span><span class="lines">@@ -73,6 +74,10 @@
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic, strong) WKUserContentController *userContentController;
</span><span class="cx">
</span><ins>+/*! @abstract The website data store to be used by the web view.
+ */
+@property (nonatomic, strong) WKWebsiteDataStore *websiteDataStore WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
</ins><span class="cx"> /*! @abstract A Boolean value indicating whether the web view suppresses
</span><span class="cx"> content rendering until it is fully loaded into memory.
</span><span class="cx"> @discussion The default value is NO.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (182874 => 182875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2015-04-16 00:45:48 UTC (rev 182874)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2015-04-16 02:25:28 UTC (rev 182875)
</span><span class="lines">@@ -123,8 +123,8 @@
</span><span class="cx"> configuration.processPool = self.processPool;
</span><span class="cx"> configuration.preferences = self.preferences;
</span><span class="cx"> configuration.userContentController = self.userContentController;
</span><ins>+ configuration.websiteDataStore = self.websiteDataStore;
</ins><span class="cx"> configuration._visitedLinkProvider = self._visitedLinkProvider;
</span><del>- configuration._websiteDataStore = self._websiteDataStore;
</del><span class="cx"> configuration._relatedWebView = _relatedWebView.get().get();
</span><span class="cx"> configuration._alternateWebViewForNavigationGestures = _alternateWebViewForNavigationGestures.get().get();
</span><span class="cx"> configuration->_treatsSHA1SignedCertificatesAsInsecure = _treatsSHA1SignedCertificatesAsInsecure;
</span><span class="lines">@@ -176,6 +176,16 @@
</span><span class="cx"> _userContentController.set(userContentController);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (WKWebsiteDataStore *)websiteDataStore
+{
+ return _websiteDataStore.get([] { return [WKWebsiteDataStore defaultDataStore]; });
+}
+
+- (void)setWebsiteDataStore:(WKWebsiteDataStore *)websiteDataStore
+{
+ _websiteDataStore.set(websiteDataStore);
+}
+
</ins><span class="cx"> static NSString *defaultApplicationNameForUserAgent()
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -207,12 +217,12 @@
</span><span class="cx">
</span><span class="cx"> - (_WKWebsiteDataStore *)_websiteDataStore
</span><span class="cx"> {
</span><del>- return (_WKWebsiteDataStore *)_websiteDataStore.get([] { return [WKWebsiteDataStore defaultDataStore]; });
</del><ins>+ return (_WKWebsiteDataStore *)self.websiteDataStore;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_setWebsiteDataStore:(_WKWebsiteDataStore *)websiteDataStore
</span><span class="cx"> {
</span><del>- _websiteDataStore.set(websiteDataStore);
</del><ins>+ self.websiteDataStore = websiteDataStore;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre>
</div>
</div>
</body>
</html>