<!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>[207993] branches/safari-602-branch/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/207993">207993</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-10-27 11:16:22 -0700 (Thu, 27 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/206684">r206684</a>. rdar://problem/28545011</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceWebKit2ChangeLog">branches/safari-602-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessAPIAPILoaderClienth">branches/safari-602-branch/Source/WebKit2/UIProcess/API/APILoaderClient.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessAPICWKContexth">branches/safari-602-branch/Source/WebKit2/UIProcess/API/C/WKContext.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessAPICWKPagecpp">branches/safari-602-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessCocoaNavigationStatemm">branches/safari-602-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessWebContextClientcpp">branches/safari-602-branch/Source/WebKit2/UIProcess/WebContextClient.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessWebContextClienth">branches/safari-602-branch/Source/WebKit2/UIProcess/WebContextClient.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessWebPageProxycpp">branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (207992 => 207993)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-10-27 18:14:12 UTC (rev 207992)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-10-27 18:16:22 UTC (rev 207993)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2016-10-27 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r206684. rdar://problem/28545011
+
+ 2016-09-30 Brady Eidson <beidson@apple.com>
+
+ REGRESSION (Safari 10 combined with WK changes): Unable to store WebCrypto keys in IndexedDB database.
+ <rdar://problem/28334440> and https://bugs.webkit.org/show_bug.cgi?id=162554
+
+ Reviewed by Alexey Proskuryakov.
+
+ Safari 10 has a WKPageNavigation client but does not implement the "copyWebCryptoMasterKey" callback.
+
+ WebKit just fails in this case, instead of falling back to "getDefaultWebCryptoMasterKey".
+ It should fall back.
+
+ Additionally there's a WKContextClient callback to get the crypto key, also, but it is completely unused.
+ So it should be pulled.
+
+ * UIProcess/API/APILoaderClient.h:
+ (API::LoaderClient::webCryptoMasterKey): Deleted.
+ * UIProcess/API/C/WKContext.h:
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageLoaderClient):
+ (WKPageSetPageNavigationClient): If the client doesn't implement this method, fallback to getDefaultWebCryptoMasterKey.
+
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::NavigationClient::webCryptoMasterKey): If the client doesn't implement this method,
+ fallback to getDefaultWebCryptoMasterKey.
+
+ * UIProcess/WebContextClient.cpp:
+ (WebKit::WebContextClient::copyWebCryptoMasterKey): Deleted.
+ * UIProcess/WebContextClient.h:
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::wrapCryptoKey): Only ask the NavigationClient before falling back. Don't ask the loader client.
+ (WebKit::WebPageProxy::unwrapCryptoKey): Ditto.
+
</ins><span class="cx"> 2016-10-26 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r207708. rdar://problem/28962914
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessAPIAPILoaderClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/API/APILoaderClient.h (207992 => 207993)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/API/APILoaderClient.h 2016-10-27 18:14:12 UTC (rev 207992)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/API/APILoaderClient.h 2016-10-27 18:16:22 UTC (rev 207993)
</span><span class="lines">@@ -93,8 +93,6 @@
</span><span class="cx"> virtual bool shouldKeepCurrentBackForwardListItemInList(WebKit::WebPageProxy&, WebKit::WebBackForwardListItem*) { return true; }
</span><span class="cx"> virtual void willGoToBackForwardListItem(WebKit::WebPageProxy&, WebKit::WebBackForwardListItem*, API::Object*) { }
</span><span class="cx">
</span><del>- virtual RefPtr<Data> webCryptoMasterKey(WebKit::WebPageProxy&) { return nullptr; }
-
</del><span class="cx"> virtual void didNavigateWithNavigationData(WebKit::WebPageProxy&, const WebKit::WebNavigationDataStore&, WebKit::WebFrameProxy&) { }
</span><span class="cx"> virtual void didPerformClientRedirect(WebKit::WebPageProxy&, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy&) { }
</span><span class="cx"> virtual void didPerformServerRedirect(WebKit::WebPageProxy&, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy&) { }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessAPICWKContexth"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/API/C/WKContext.h (207992 => 207993)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/API/C/WKContext.h 2016-10-27 18:14:12 UTC (rev 207992)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/API/C/WKContext.h 2016-10-27 18:16:22 UTC (rev 207993)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> WKContextPlugInInformationBecameAvailableCallback plugInInformationBecameAvailable;
</span><span class="cx">
</span><span class="cx"> // Version 1.
</span><del>- WKContextCopyWebCryptoMasterKeyCallback copyWebCryptoMasterKey;
</del><ins>+ void (*copyWebCryptoMasterKey_unavailable)(void);
</ins><span class="cx"> } WKContextClientV1;
</span><span class="cx">
</span><span class="cx"> typedef struct WKContextClientV2 {
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> WKContextPlugInInformationBecameAvailableCallback plugInInformationBecameAvailable;
</span><span class="cx">
</span><span class="cx"> // Version 1.
</span><del>- WKContextCopyWebCryptoMasterKeyCallback copyWebCryptoMasterKey;
</del><ins>+ void (*copyWebCryptoMasterKey_unavailable)(void);
</ins><span class="cx">
</span><span class="cx"> // Version 2.
</span><span class="cx"> WKContextDatabaseProcessDidCrashCallback databaseProcessDidCrash;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp (207992 => 207993)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-10-27 18:14:12 UTC (rev 207992)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-10-27 18:16:22 UTC (rev 207993)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> #include "WebProtectionSpace.h"
</span><span class="cx"> #include <WebCore/Page.h>
</span><span class="cx"> #include <WebCore/SecurityOriginData.h>
</span><ins>+#include <WebCore/SerializedCryptoKeyWrap.h>
</ins><span class="cx"> #include <WebCore/WindowFeatures.h>
</span><span class="cx">
</span><span class="cx"> #ifdef __BLOCKS__
</span><span class="lines">@@ -1214,11 +1215,6 @@
</span><span class="cx"> m_client.willGoToBackForwardListItem(toAPI(&page), toAPI(item), toAPI(userData), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<API::Data> webCryptoMasterKey(WebPageProxy& page) override
- {
- return page.process().processPool().client().copyWebCryptoMasterKey(&page.process().processPool());
- }
-
</del><span class="cx"> void navigationGestureDidBegin(WebPageProxy& page) override
</span><span class="cx"> {
</span><span class="cx"> if (m_client.navigationGestureDidBegin)
</span><span class="lines">@@ -2326,9 +2322,14 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<API::Data> webCryptoMasterKey(WebPageProxy& page) override
</span><span class="cx"> {
</span><del>- if (!m_client.copyWebCryptoMasterKey)
</del><ins>+ if (m_client.copyWebCryptoMasterKey)
+ return adoptRef(toImpl(m_client.copyWebCryptoMasterKey(toAPI(&page), m_client.base.clientInfo)));
+
+ Vector<uint8_t> masterKey;
+ if (!getDefaultWebCryptoMasterKey(masterKey))
</ins><span class="cx"> return nullptr;
</span><del>- return adoptRef(toImpl(m_client.copyWebCryptoMasterKey(toAPI(&page), m_client.base.clientInfo)));
</del><ins>+
+ return API::Data::create(masterKey.data(), masterKey.size());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void didBeginNavigationGesture(WebPageProxy& page) override
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (207992 => 207993)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2016-10-27 18:14:12 UTC (rev 207992)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2016-10-27 18:16:22 UTC (rev 207993)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> #import "_WKSameDocumentNavigationTypeInternal.h"
</span><span class="cx"> #import <WebCore/Credential.h>
</span><span class="cx"> #import <WebCore/SecurityOriginData.h>
</span><ins>+#import <WebCore/SerializedCryptoKeyWrap.h>
</ins><span class="cx"> #import <WebCore/URL.h>
</span><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="lines">@@ -715,9 +716,14 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<API::Data> NavigationState::NavigationClient::webCryptoMasterKey(WebKit::WebPageProxy&)
</span><span class="cx"> {
</span><del>- if (!m_navigationState.m_navigationDelegateMethods.webCryptoMasterKeyForWebView)
- return nullptr;
</del><ins>+ if (!m_navigationState.m_navigationDelegateMethods.webCryptoMasterKeyForWebView) {
+ Vector<uint8_t> masterKey;
+ if (!getDefaultWebCryptoMasterKey(masterKey))
+ return nullptr;
</ins><span class="cx">
</span><ins>+ return API::Data::create(masterKey.data(), masterKey.size());
+ }
+
</ins><span class="cx"> auto navigationDelegate = m_navigationState.m_navigationDelegate.get();
</span><span class="cx"> if (!navigationDelegate)
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessWebContextClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/WebContextClient.cpp (207992 => 207993)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/WebContextClient.cpp 2016-10-27 18:14:12 UTC (rev 207992)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/WebContextClient.cpp 2016-10-27 18:16:22 UTC (rev 207993)
</span><span class="lines">@@ -65,13 +65,5 @@
</span><span class="cx">
</span><span class="cx"> m_client.plugInInformationBecameAvailable(toAPI(processPool), toAPI(plugInInfo), m_client.base.clientInfo);
</span><span class="cx"> }
</span><del>-
-PassRefPtr<API::Data> WebContextClient::copyWebCryptoMasterKey(WebProcessPool* processPool)
-{
- if (!m_client.copyWebCryptoMasterKey)
- return nullptr;
-
- return adoptRef(toImpl(m_client.copyWebCryptoMasterKey(toAPI(processPool), m_client.base.clientInfo)));
-}
-
</del><ins>+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessWebContextClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/WebContextClient.h (207992 => 207993)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/WebContextClient.h 2016-10-27 18:14:12 UTC (rev 207992)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/WebContextClient.h 2016-10-27 18:16:22 UTC (rev 207993)
</span><span class="lines">@@ -49,7 +49,6 @@
</span><span class="cx"> void networkProcessDidCrash(WebProcessPool*);
</span><span class="cx"> void databaseProcessDidCrash(WebProcessPool*);
</span><span class="cx"> void plugInInformationBecameAvailable(WebProcessPool*, API::Array*);
</span><del>- PassRefPtr<API::Data> copyWebCryptoMasterKey(WebProcessPool*);
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (207992 => 207993)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-10-27 18:14:12 UTC (rev 207992)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-10-27 18:16:22 UTC (rev 207993)
</span><span class="lines">@@ -6064,9 +6064,7 @@
</span><span class="cx"> if (m_navigationClient) {
</span><span class="cx"> if (RefPtr<API::Data> keyData = m_navigationClient->webCryptoMasterKey(*this))
</span><span class="cx"> masterKey = keyData->dataReference().vector();
</span><del>- } else if (RefPtr<API::Data> keyData = m_loaderClient->webCryptoMasterKey(*this))
- masterKey = keyData->dataReference().vector();
- else if (!getDefaultWebCryptoMasterKey(masterKey)) {
</del><ins>+ } else if (!getDefaultWebCryptoMasterKey(masterKey)) {
</ins><span class="cx"> succeeded = false;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -6083,9 +6081,7 @@
</span><span class="cx"> if (m_navigationClient) {
</span><span class="cx"> if (RefPtr<API::Data> keyData = m_navigationClient->webCryptoMasterKey(*this))
</span><span class="cx"> masterKey = keyData->dataReference().vector();
</span><del>- } else if (RefPtr<API::Data> keyData = m_loaderClient->webCryptoMasterKey(*this))
- masterKey = keyData->dataReference().vector();
- else if (!getDefaultWebCryptoMasterKey(masterKey)) {
</del><ins>+ } else if (!getDefaultWebCryptoMasterKey(masterKey)) {
</ins><span class="cx"> succeeded = false;
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>