<!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>[188543] 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/188543">188543</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2015-08-17 14:50:24 -0700 (Mon, 17 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>API::PageConfiguration's sessionID needs to be set whenever the API::WebsiteDataStore is set
https://bugs.webkit.org/show_bug.cgi?id=148097
Reviewed by Anders Carlsson.
Source/WebKit2:
We were getting an empty SessionID set on the WebPageProxy (and crashing asserting down the line)
when using a WKPageConfiguration with a WKWebsiteDataStore set on it.
Tests:
WebKit2.WKPageConfigurationBasicWithDataStore
WebKit2.WKPageConfigurationBasicWithNonPersistentDataStore
* UIProcess/API/APIPageConfiguration.cpp:
(API::PageConfiguration::setWebsiteDataStore):
Set the sessionID member whenever changing the WebsiteDataStore.
* UIProcess/API/C/WKWebsiteDataStoreRef.cpp:
(WKWebsiteDataStoreGetDefaultDataStore):
(WKWebsiteDataStoreCreateNonPersistentDataStore):
* UIProcess/API/C/WKWebsiteDataStoreRef.h:
Expose functions for getting default and new non-persistent data stores via the C-SPI. Useful
for testing and transitioning users of the C-SPI to the new model.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
Remove explicit setting of the sessionID. This is handled by the above call to setWebsiteDataStore().
Tools:
* TestWebKitAPI/Tests/WebKit2/WKPageConfiguration.cpp:
Add tests for WebsiteDataStores in the WKPageConfiguration.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIPageConfigurationcpp">trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKWebsiteDataStoreRefcpp">trunk/Source/WebKit2/UIProcess/API/C/WKWebsiteDataStoreRef.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKWebsiteDataStoreRefh">trunk/Source/WebKit2/UIProcess/API/C/WKWebsiteDataStoreRef.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2WKPageConfigurationcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPageConfiguration.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (188542 => 188543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-08-17 21:40:30 UTC (rev 188542)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-17 21:50:24 UTC (rev 188543)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-08-17 Sam Weinig <sam@webkit.org>
+
+ API::PageConfiguration's sessionID needs to be set whenever the API::WebsiteDataStore is set
+ https://bugs.webkit.org/show_bug.cgi?id=148097
+
+ Reviewed by Anders Carlsson.
+
+ We were getting an empty SessionID set on the WebPageProxy (and crashing asserting down the line)
+ when using a WKPageConfiguration with a WKWebsiteDataStore set on it.
+
+ Tests:
+ WebKit2.WKPageConfigurationBasicWithDataStore
+ WebKit2.WKPageConfigurationBasicWithNonPersistentDataStore
+
+ * UIProcess/API/APIPageConfiguration.cpp:
+ (API::PageConfiguration::setWebsiteDataStore):
+ Set the sessionID member whenever changing the WebsiteDataStore.
+
+ * UIProcess/API/C/WKWebsiteDataStoreRef.cpp:
+ (WKWebsiteDataStoreGetDefaultDataStore):
+ (WKWebsiteDataStoreCreateNonPersistentDataStore):
+ * UIProcess/API/C/WKWebsiteDataStoreRef.h:
+ Expose functions for getting default and new non-persistent data stores via the C-SPI. Useful
+ for testing and transitioning users of the C-SPI to the new model.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ Remove explicit setting of the sessionID. This is handled by the above call to setWebsiteDataStore().
+
</ins><span class="cx"> 2015-08-17 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Cannot change WKWebView scrollView deceleration rate
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIPageConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.cpp (188542 => 188543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.cpp 2015-08-17 21:40:30 UTC (rev 188542)
+++ trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.cpp 2015-08-17 21:50:24 UTC (rev 188543)
</span><span class="lines">@@ -141,6 +141,11 @@
</span><span class="cx"> void PageConfiguration::setWebsiteDataStore(API::WebsiteDataStore* websiteDataStore)
</span><span class="cx"> {
</span><span class="cx"> m_websiteDataStore = websiteDataStore;
</span><ins>+
+ if (m_websiteDataStore)
+ m_sessionID = m_websiteDataStore->websiteDataStore().sessionID();
+ else
+ m_sessionID = WebCore::SessionID();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebCore::SessionID PageConfiguration::sessionID()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKWebsiteDataStoreRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKWebsiteDataStoreRef.cpp (188542 => 188543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKWebsiteDataStoreRef.cpp 2015-08-17 21:40:30 UTC (rev 188542)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKWebsiteDataStoreRef.cpp 2015-08-17 21:50:24 UTC (rev 188543)
</span><span class="lines">@@ -33,3 +33,13 @@
</span><span class="cx"> {
</span><span class="cx"> return WebKit::toAPI(API::WebsiteDataStore::APIType);
</span><span class="cx"> }
</span><ins>+
+WKWebsiteDataStoreRef WKWebsiteDataStoreGetDefaultDataStore()
+{
+ return WebKit::toAPI(API::WebsiteDataStore::defaultDataStore().get());
+}
+
+WKWebsiteDataStoreRef WKWebsiteDataStoreCreateNonPersistentDataStore()
+{
+ return WebKit::toAPI(&API::WebsiteDataStore::createNonPersistentDataStore().leakRef());
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKWebsiteDataStoreRefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKWebsiteDataStoreRef.h (188542 => 188543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKWebsiteDataStoreRef.h 2015-08-17 21:40:30 UTC (rev 188542)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKWebsiteDataStoreRef.h 2015-08-17 21:50:24 UTC (rev 188543)
</span><span class="lines">@@ -34,6 +34,9 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKTypeID WKWebsiteDataStoreGetTypeID();
</span><span class="cx">
</span><ins>+WK_EXPORT WKWebsiteDataStoreRef WKWebsiteDataStoreGetDefaultDataStore();
+WK_EXPORT WKWebsiteDataStoreRef WKWebsiteDataStoreCreateNonPersistentDataStore();
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (188542 => 188543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-08-17 21:40:30 UTC (rev 188542)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-08-17 21:50:24 UTC (rev 188543)
</span><span class="lines">@@ -312,7 +312,6 @@
</span><span class="cx"> pageConfiguration->setUserContentController([_configuration userContentController]->_userContentControllerProxy.get());
</span><span class="cx"> pageConfiguration->setVisitedLinkProvider([_configuration _visitedLinkProvider]->_visitedLinkProvider.get());
</span><span class="cx"> pageConfiguration->setWebsiteDataStore([_configuration websiteDataStore]->_websiteDataStore.get());
</span><del>- pageConfiguration->setSessionID(pageConfiguration->websiteDataStore()->websiteDataStore().sessionID());
</del><span class="cx"> pageConfiguration->setTreatsSHA1SignedCertificatesAsInsecure([_configuration _treatsSHA1SignedCertificatesAsInsecure]);
</span><span class="cx">
</span><span class="cx"> RefPtr<WebKit::WebPageGroup> pageGroup;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (188542 => 188543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-08-17 21:40:30 UTC (rev 188542)
+++ trunk/Tools/ChangeLog 2015-08-17 21:50:24 UTC (rev 188543)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-17 Sam Weinig <sam@webkit.org>
+
+ API::PageConfiguration's sessionID needs to be set whenever the API::WebsiteDataStore is set
+ https://bugs.webkit.org/show_bug.cgi?id=148097
+
+ Reviewed by Anders Carlsson.
+
+ * TestWebKitAPI/Tests/WebKit2/WKPageConfiguration.cpp:
+ Add tests for WebsiteDataStores in the WKPageConfiguration.
+
</ins><span class="cx"> 2015-08-17 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: load ProtocolTestStub from the WebInspectorUI bundle
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2WKPageConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPageConfiguration.cpp (188542 => 188543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPageConfiguration.cpp 2015-08-17 21:40:30 UTC (rev 188542)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPageConfiguration.cpp 2015-08-17 21:50:24 UTC (rev 188543)
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx"> #include "PlatformWebView.h"
</span><span class="cx"> #include "Test.h"
</span><span class="cx">
</span><ins>+#include <WebKit/WKWebsiteDataStoreRef.h>
+
</ins><span class="cx"> namespace TestWebKitAPI {
</span><span class="cx">
</span><span class="cx"> TEST(WebKit2, WKPageConfigurationEmpty)
</span><span class="lines">@@ -70,13 +72,61 @@
</span><span class="cx">
</span><span class="cx"> PlatformWebView webView(configuration.get());
</span><span class="cx"> setPageLoaderClient(webView.page());
</span><ins>+
+ WKRetainPtr<WKPageConfigurationRef> copiedConfiguration = adoptWK(WKPageCopyPageConfiguration(webView.page()));
+ ASSERT_EQ(context.get(), WKPageConfigurationGetContext(copiedConfiguration.get()));
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKURLRef> url = adoptWK(Util::createURLForResource("simple", "html"));
</span><span class="cx"> WKPageLoadURL(webView.page(), url.get());
</span><span class="cx">
</span><ins>+ didFinishLoad = false;
</ins><span class="cx"> Util::run(&didFinishLoad);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TEST(WebKit2, WKPageConfigurationBasicWithDataStore)
+{
+ WKRetainPtr<WKPageConfigurationRef> configuration = adoptWK(WKPageConfigurationCreate());
+ WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
+ WKPageConfigurationSetContext(configuration.get(), context.get());
+ WKRetainPtr<WKWebsiteDataStoreRef> websiteDataStore = WKWebsiteDataStoreGetDefaultDataStore();
+ WKPageConfigurationSetWebsiteDataStore(configuration.get(), websiteDataStore.get());
+
+ PlatformWebView webView(configuration.get());
+ setPageLoaderClient(webView.page());
+
+ WKRetainPtr<WKPageConfigurationRef> copiedConfiguration = adoptWK(WKPageCopyPageConfiguration(webView.page()));
+ ASSERT_EQ(context.get(), WKPageConfigurationGetContext(copiedConfiguration.get()));
+ ASSERT_EQ(WKWebsiteDataStoreGetDefaultDataStore(), WKPageConfigurationGetWebsiteDataStore(copiedConfiguration.get()));
+
+ WKRetainPtr<WKURLRef> url = adoptWK(Util::createURLForResource("simple", "html"));
+ WKPageLoadURL(webView.page(), url.get());
+
+ didFinishLoad = false;
+ Util::run(&didFinishLoad);
+}
+
+TEST(WebKit2, WKPageConfigurationBasicWithNonPersistentDataStore)
+{
+ WKRetainPtr<WKPageConfigurationRef> configuration = adoptWK(WKPageConfigurationCreate());
+ WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
+ WKPageConfigurationSetContext(configuration.get(), context.get());
+ WKRetainPtr<WKWebsiteDataStoreRef> websiteDataStore = adoptWK(WKWebsiteDataStoreCreateNonPersistentDataStore());
+ WKPageConfigurationSetWebsiteDataStore(configuration.get(), websiteDataStore.get());
+
+ PlatformWebView webView(configuration.get());
+ setPageLoaderClient(webView.page());
+
+ WKRetainPtr<WKPageConfigurationRef> copiedConfiguration = adoptWK(WKPageCopyPageConfiguration(webView.page()));
+ ASSERT_EQ(context.get(), WKPageConfigurationGetContext(copiedConfiguration.get()));
+ ASSERT_EQ(websiteDataStore.get(), WKPageConfigurationGetWebsiteDataStore(copiedConfiguration.get()));
+
+ WKRetainPtr<WKURLRef> url = adoptWK(Util::createURLForResource("simple", "html"));
+ WKPageLoadURL(webView.page(), url.get());
+
+ didFinishLoad = false;
+ Util::run(&didFinishLoad);
+}
+
</ins><span class="cx"> } // namespace TestWebKitAPI
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>