<!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>[211165] 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/211165">211165</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2017-01-25 14:31:24 -0800 (Wed, 25 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[QuickLook] Display a WKPasswordView when a document is password-protected
https://bugs.webkit.org/show_bug.cgi?id=167407
<rdar://problem/28544527>
Reviewed by Alex Christensen.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _hidePasswordView]): Added an early return if there is no _passwordView.
* UIProcess/PageClient.h: Declared requestPasswordForQuickLookDocument().
(WebKit::PageClient::didStartProvisionalLoadForMainFrame): Added an no-op base class
implementation.
(WebKit::PageClient::didFailProvisionalLoadForMainFrame): Ditto.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didStartProvisionalLoadForFrame): Called
PageClient::didStartProvisionalLoadForMainFrame() if frame is the main frame.
(WebKit::WebPageProxy::didFailProvisionalLoadForFrame): Ditto for
PageClient::didFailProvisionalLoadForMainFrame().
* UIProcess/WebPageProxy.h: Declared didRequestPasswordForQuickLookDocumentInMainFrame().
* UIProcess/WebPageProxy.messages.in: Added message
DidRequestPasswordForQuickLookDocumentInMainFrame.
* UIProcess/ios/PageClientImplIOS.h: Overrode requestPasswordForQuickLookDocument(),
didStartProvisionalLoadForMainFrame(), and didFailProvisionalLoadForMainFrame().
* UIProcess/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::didStartProvisionalLoadForMainFrame): Called
-[WKWebView _hidePasswordView].
(WebKit::PageClientImpl::didFailProvisionalLoadForMainFrame): Ditto.
(WebKit::PageClientImpl::didCommitLoadForMainFrame): Ditto.
(WebKit::PageClientImpl::requestPasswordForQuickLookDocument): If there is already a
password view, assert that it is for the same fileName. Call
-[WKPasswordView showPasswordFailureAlert] and update the userDidEnterPassword block.
Otherwise, call -[WKWebView _showPasswordViewWithDocumentName:passwordHandler:].
* UIProcess/ios/WebPageProxyIOS.mm:
(WebKit::WebPageProxy::didRequestPasswordForQuickLookDocumentInMainFrame): Called
PageClient::requestPasswordForQuickLookDocument() with a completion handler that send
message WebPage::DidReceivePasswordForQuickLookDocument.
* WebProcess/WebCoreSupport/ios/WebQuickLookHandleClient.cpp:
(WebKit::passwordCallbacks): Stores a map of page IDs to completion handler functions.
(WebKit::WebQuickLookHandleClient::~WebQuickLookHandleClient): Removes the current page ID
from passwordCallbacks().
(WebKit::WebQuickLookHandleClient::didRequestPassword): Asserts there is no current function
for this page ID in passwordCallbacks(), adds completionHandler to passwordCallbacks(), and
sends message WebPageProxy::DidRequestPasswordForQuickLookDocumentInMainFrame.
(WebKit::WebQuickLookHandleClient::didReceivePassword): Asserts there is a function for this
page ID in passwordCallbacks(), takes the completionHandler from passwordCallbacks(), and
calls it with the received password.
* WebProcess/WebCoreSupport/ios/WebQuickLookHandleClient.h: Declared didReceivePassword()
and overrode supportsPasswordEntry() and didRequestPassword().
* WebProcess/WebPage/WebPage.h: Declared didReceivePasswordForQuickLookDocument().
* WebProcess/WebPage/WebPage.messages.in: Added message
DidReceivePasswordForQuickLookDocument.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::didReceivePasswordForQuickLookDocument): Called
WebQuickLookHandleClient::didReceivePassword() with the received password and current page ID.</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="#trunkSourceWebKit2UIProcessPageClienth">trunk/Source/WebKit2/UIProcess/PageClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosPageClientImplIOSh">trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosPageClientImplIOSmm">trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm">trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportiosWebQuickLookHandleClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebQuickLookHandleClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportiosWebQuickLookHandleClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebQuickLookHandleClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (211164 => 211165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-01-25 22:05:02 UTC (rev 211164)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-25 22:31:24 UTC (rev 211165)
</span><span class="lines">@@ -1,3 +1,59 @@
</span><ins>+2017-01-25 Andy Estes <aestes@apple.com>
+
+ [QuickLook] Display a WKPasswordView when a document is password-protected
+ https://bugs.webkit.org/show_bug.cgi?id=167407
+ <rdar://problem/28544527>
+
+ Reviewed by Alex Christensen.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _hidePasswordView]): Added an early return if there is no _passwordView.
+ * UIProcess/PageClient.h: Declared requestPasswordForQuickLookDocument().
+ (WebKit::PageClient::didStartProvisionalLoadForMainFrame): Added an no-op base class
+ implementation.
+ (WebKit::PageClient::didFailProvisionalLoadForMainFrame): Ditto.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didStartProvisionalLoadForFrame): Called
+ PageClient::didStartProvisionalLoadForMainFrame() if frame is the main frame.
+ (WebKit::WebPageProxy::didFailProvisionalLoadForFrame): Ditto for
+ PageClient::didFailProvisionalLoadForMainFrame().
+ * UIProcess/WebPageProxy.h: Declared didRequestPasswordForQuickLookDocumentInMainFrame().
+ * UIProcess/WebPageProxy.messages.in: Added message
+ DidRequestPasswordForQuickLookDocumentInMainFrame.
+ * UIProcess/ios/PageClientImplIOS.h: Overrode requestPasswordForQuickLookDocument(),
+ didStartProvisionalLoadForMainFrame(), and didFailProvisionalLoadForMainFrame().
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::didStartProvisionalLoadForMainFrame): Called
+ -[WKWebView _hidePasswordView].
+ (WebKit::PageClientImpl::didFailProvisionalLoadForMainFrame): Ditto.
+ (WebKit::PageClientImpl::didCommitLoadForMainFrame): Ditto.
+ (WebKit::PageClientImpl::requestPasswordForQuickLookDocument): If there is already a
+ password view, assert that it is for the same fileName. Call
+ -[WKPasswordView showPasswordFailureAlert] and update the userDidEnterPassword block.
+ Otherwise, call -[WKWebView _showPasswordViewWithDocumentName:passwordHandler:].
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::didRequestPasswordForQuickLookDocumentInMainFrame): Called
+ PageClient::requestPasswordForQuickLookDocument() with a completion handler that send
+ message WebPage::DidReceivePasswordForQuickLookDocument.
+ * WebProcess/WebCoreSupport/ios/WebQuickLookHandleClient.cpp:
+ (WebKit::passwordCallbacks): Stores a map of page IDs to completion handler functions.
+ (WebKit::WebQuickLookHandleClient::~WebQuickLookHandleClient): Removes the current page ID
+ from passwordCallbacks().
+ (WebKit::WebQuickLookHandleClient::didRequestPassword): Asserts there is no current function
+ for this page ID in passwordCallbacks(), adds completionHandler to passwordCallbacks(), and
+ sends message WebPageProxy::DidRequestPasswordForQuickLookDocumentInMainFrame.
+ (WebKit::WebQuickLookHandleClient::didReceivePassword): Asserts there is a function for this
+ page ID in passwordCallbacks(), takes the completionHandler from passwordCallbacks(), and
+ calls it with the received password.
+ * WebProcess/WebCoreSupport/ios/WebQuickLookHandleClient.h: Declared didReceivePassword()
+ and overrode supportsPasswordEntry() and didRequestPassword().
+ * WebProcess/WebPage/WebPage.h: Declared didReceivePasswordForQuickLookDocument().
+ * WebProcess/WebPage/WebPage.messages.in: Added message
+ DidReceivePasswordForQuickLookDocument.
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::didReceivePasswordForQuickLookDocument): Called
+ WebQuickLookHandleClient::didReceivePassword() with the received password and current page ID.
+
</ins><span class="cx"> 2017-01-25 Youenn Fablet <youennf@gmail.com>
</span><span class="cx">
</span><span class="cx"> [WebRTC] Introduce libwebrtc abstraction for WK1/WK2 implementations
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (211164 => 211165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-01-25 22:05:02 UTC (rev 211164)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-01-25 22:31:24 UTC (rev 211165)
</span><span class="lines">@@ -2347,6 +2347,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)_hidePasswordView
</span><span class="cx"> {
</span><ins>+ if (!_passwordView)
+ return;
+
</ins><span class="cx"> self._currentContentView.hidden = NO;
</span><span class="cx"> [_passwordView removeFromSuperview];
</span><span class="cx"> _passwordView = nil;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (211164 => 211165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageClient.h 2017-01-25 22:05:02 UTC (rev 211164)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2017-01-25 22:31:24 UTC (rev 211165)
</span><span class="lines">@@ -138,6 +138,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ virtual void didStartProvisionalLoadForMainFrame() { };
+ virtual void didFailProvisionalLoadForMainFrame() { };
</ins><span class="cx"> virtual void didCommitLoadForMainFrame(const String& mimeType, bool useCustomContentProvider) = 0;
</span><span class="cx">
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</span><span class="lines">@@ -375,6 +377,10 @@
</span><span class="cx"> virtual bool windowIsFrontWindowUnderMouse(const NativeWebMouseEvent&) { return false; }
</span><span class="cx">
</span><span class="cx"> virtual WebCore::UserInterfaceLayoutDirection userInterfaceLayoutDirection() = 0;
</span><ins>+
+#if USE(QUICK_LOOK)
+ virtual void requestPasswordForQuickLookDocument(const String& fileName, std::function<void(const String&)>&&) = 0;
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (211164 => 211165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-01-25 22:05:02 UTC (rev 211164)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-01-25 22:31:24 UTC (rev 211165)
</span><span class="lines">@@ -3171,6 +3171,7 @@
</span><span class="cx">
</span><span class="cx"> if (frame->isMainFrame()) {
</span><span class="cx"> m_pageLoadState.didStartProvisionalLoad(transaction, url, unreachableURL);
</span><ins>+ m_pageClient.didStartProvisionalLoadForMainFrame();
</ins><span class="cx"> hideValidationMessage();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3246,8 +3247,10 @@
</span><span class="cx">
</span><span class="cx"> auto transaction = m_pageLoadState.transaction();
</span><span class="cx">
</span><del>- if (frame->isMainFrame())
</del><ins>+ if (frame->isMainFrame()) {
</ins><span class="cx"> m_pageLoadState.didFailProvisionalLoad(transaction);
</span><ins>+ m_pageClient.didFailProvisionalLoadForMainFrame();
+ }
</ins><span class="cx">
</span><span class="cx"> frame->didFailProvisionalLoad();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (211164 => 211165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-01-25 22:05:02 UTC (rev 211164)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-01-25 22:31:24 UTC (rev 211165)
</span><span class="lines">@@ -1571,6 +1571,7 @@
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><span class="cx"> void didStartLoadForQuickLookDocumentInMainFrame(const String& fileName, const String& uti);
</span><span class="cx"> void didFinishLoadForQuickLookDocumentInMainFrame(const QuickLookDocumentData&);
</span><ins>+ void didRequestPasswordForQuickLookDocumentInMainFrame(const String& fileName);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (211164 => 211165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2017-01-25 22:05:02 UTC (rev 211164)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2017-01-25 22:31:24 UTC (rev 211165)
</span><span class="lines">@@ -431,6 +431,7 @@
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><span class="cx"> DidStartLoadForQuickLookDocumentInMainFrame(String fileName, String uti)
</span><span class="cx"> DidFinishLoadForQuickLookDocumentInMainFrame(WebKit::QuickLookDocumentData data)
</span><ins>+ DidRequestPasswordForQuickLookDocumentInMainFrame(String fileName)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosPageClientImplIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h (211164 => 211165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2017-01-25 22:05:02 UTC (rev 211164)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2017-01-25 22:31:24 UTC (rev 211165)
</span><span class="lines">@@ -65,6 +65,8 @@
</span><span class="cx"> void preferencesDidChange() override;
</span><span class="cx"> void toolTipChanged(const String&, const String&) override;
</span><span class="cx"> bool decidePolicyForGeolocationPermissionRequest(WebFrameProxy&, API::SecurityOrigin&, GeolocationPermissionRequestProxy&) override;
</span><ins>+ void didStartProvisionalLoadForMainFrame() override;
+ void didFailProvisionalLoadForMainFrame() override;
</ins><span class="cx"> void didCommitLoadForMainFrame(const String& mimeType, bool useCustomContentProvider) override;
</span><span class="cx"> void handleDownloadRequest(DownloadProxy*) override;
</span><span class="cx"> void didChangeContentSize(const WebCore::IntSize&) override;
</span><span class="lines">@@ -196,6 +198,8 @@
</span><span class="cx">
</span><span class="cx"> void handleActiveNowPlayingSessionInfoResponse(bool hasActiveSession, const String& title, double duration, double elapsedTime) override;
</span><span class="cx">
</span><ins>+ void requestPasswordForQuickLookDocument(const String& fileName, std::function<void(const String&)>&&) override;
+
</ins><span class="cx"> WKContentView *m_contentView;
</span><span class="cx"> WKWebView *m_webView;
</span><span class="cx"> RetainPtr<WKEditorUndoTargetObjC> m_undoTarget;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosPageClientImplIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (211164 => 211165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2017-01-25 22:05:02 UTC (rev 211164)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2017-01-25 22:31:24 UTC (rev 211165)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #import "WKContentView.h"
</span><span class="cx"> #import "WKContentViewInteraction.h"
</span><span class="cx"> #import "WKGeolocationProviderIOS.h"
</span><ins>+#import "WKPasswordView.h"
</ins><span class="cx"> #import "WKProcessPoolInternal.h"
</span><span class="cx"> #import "WKWebViewConfigurationInternal.h"
</span><span class="cx"> #import "WKWebViewContentProviderRegistry.h"
</span><span class="lines">@@ -227,8 +228,19 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PageClientImpl::didStartProvisionalLoadForMainFrame()
+{
+ [m_webView _hidePasswordView];
+}
+
+void PageClientImpl::didFailProvisionalLoadForMainFrame()
+{
+ [m_webView _hidePasswordView];
+}
+
</ins><span class="cx"> void PageClientImpl::didCommitLoadForMainFrame(const String& mimeType, bool useCustomContentProvider)
</span><span class="cx"> {
</span><ins>+ [m_webView _hidePasswordView];
</ins><span class="cx"> [m_webView _setHasCustomContentView:useCustomContentProvider loadedMIMEType:mimeType];
</span><span class="cx"> [m_contentView _didCommitLoadForMainFrame];
</span><span class="cx"> }
</span><span class="lines">@@ -755,6 +767,20 @@
</span><span class="cx"> [m_webView _handleActiveNowPlayingSessionInfoResponse:hasActiveSession title:nsStringFromWebCoreString(title) duration:duration elapsedTime:elapsedTime];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PageClientImpl::requestPasswordForQuickLookDocument(const String& fileName, std::function<void(const String&)>&& completionHandler)
+{
+ auto passwordHandler = [completionHandler = WTFMove(completionHandler)](NSString *password) {
+ completionHandler(password);
+ };
+
+ if (WKPasswordView *passwordView = m_webView._passwordView) {
+ ASSERT(fileName == String { passwordView.documentName });
+ [passwordView showPasswordFailureAlert];
+ passwordView.userDidEnterPassword = passwordHandler;
+ } else
+ [m_webView _showPasswordViewWithDocumentName:fileName passwordHandler:passwordHandler];
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (211164 => 211165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2017-01-25 22:05:02 UTC (rev 211164)
+++ trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2017-01-25 22:31:24 UTC (rev 211165)
</span><span class="lines">@@ -1100,6 +1100,14 @@
</span><span class="cx"> else
</span><span class="cx"> m_loaderClient->didFinishLoadForQuickLookDocumentInMainFrame(data);
</span><span class="cx"> }
</span><ins>+
+void WebPageProxy::didRequestPasswordForQuickLookDocumentInMainFrame(const String& fileName)
+{
+ m_pageClient.requestPasswordForQuickLookDocument(fileName, [protectedThis = makeRefPtr(this)](const String& password) {
+ protectedThis->process().send(Messages::WebPage::DidReceivePasswordForQuickLookDocument(password), protectedThis->m_pageID);
+ });
+}
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportiosWebQuickLookHandleClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebQuickLookHandleClient.cpp (211164 => 211165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebQuickLookHandleClient.cpp 2017-01-25 22:05:02 UTC (rev 211164)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebQuickLookHandleClient.cpp 2017-01-25 22:31:24 UTC (rev 211165)
</span><span class="lines">@@ -31,9 +31,19 @@
</span><span class="cx"> #include "WebPageProxyMessages.h"
</span><span class="cx"> #include "WebProcess.h"
</span><span class="cx"> #include <WebCore/QuickLook.h>
</span><ins>+#include <wtf/Function.h>
+#include <wtf/HashMap.h>
+#include <wtf/NeverDestroyed.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+using PasswordCallbackMap = HashMap<uint64_t, Function<void(const String&)>>;
+static PasswordCallbackMap& passwordCallbacks()
+{
+ static NeverDestroyed<PasswordCallbackMap> callbackMap;
+ return callbackMap.get();
+}
+
</ins><span class="cx"> WebQuickLookHandleClient::WebQuickLookHandleClient(const WebCore::QuickLookHandle& handle, uint64_t pageID)
</span><span class="cx"> : m_fileName(handle.previewFileName())
</span><span class="cx"> , m_uti(handle.previewUTI())
</span><span class="lines">@@ -42,6 +52,11 @@
</span><span class="cx"> WebProcess::singleton().send(Messages::WebPageProxy::DidStartLoadForQuickLookDocumentInMainFrame(m_fileName, m_uti), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WebQuickLookHandleClient::~WebQuickLookHandleClient()
+{
+ passwordCallbacks().remove(m_pageID);
+}
+
</ins><span class="cx"> void WebQuickLookHandleClient::didReceiveDataArray(CFArrayRef dataArray)
</span><span class="cx"> {
</span><span class="cx"> CFArrayApplyFunction(dataArray, CFRangeMake(0, CFArrayGetCount(dataArray)), [](const void* value, void* context) {
</span><span class="lines">@@ -61,6 +76,20 @@
</span><span class="cx"> m_data.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebQuickLookHandleClient::didRequestPassword(Function<void(const String&)>&& completionHandler)
+{
+ ASSERT(!passwordCallbacks().contains(m_pageID));
+ passwordCallbacks().add(m_pageID, WTFMove(completionHandler));
+ WebProcess::singleton().send(Messages::WebPageProxy::DidRequestPasswordForQuickLookDocumentInMainFrame(m_fileName), m_pageID);
+}
+
+void WebQuickLookHandleClient::didReceivePassword(const String& password, uint64_t pageID)
+{
+ ASSERT(passwordCallbacks().contains(pageID));
+ auto completionHandler = passwordCallbacks().take(pageID);
+ completionHandler(password);
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // USE(QUICK_LOOK)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportiosWebQuickLookHandleClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebQuickLookHandleClient.h (211164 => 211165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebQuickLookHandleClient.h 2017-01-25 22:05:02 UTC (rev 211164)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebQuickLookHandleClient.h 2017-01-25 22:31:24 UTC (rev 211165)
</span><span class="lines">@@ -46,12 +46,17 @@
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(*new WebQuickLookHandleClient(handle, pageID));
</span><span class="cx"> }
</span><ins>+ ~WebQuickLookHandleClient();
</ins><span class="cx">
</span><ins>+ static void didReceivePassword(const String&, uint64_t pageID);
+
</ins><span class="cx"> private:
</span><span class="cx"> WebQuickLookHandleClient(const WebCore::QuickLookHandle&, uint64_t pageID);
</span><span class="cx"> void didReceiveDataArray(CFArrayRef) override;
</span><span class="cx"> void didFinishLoading() override;
</span><span class="cx"> void didFail() override;
</span><ins>+ bool supportsPasswordEntry() const override { return true; }
+ void didRequestPassword(Function<void(const String&)>&&) override;
</ins><span class="cx">
</span><span class="cx"> const String m_fileName;
</span><span class="cx"> const String m_uti;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (211164 => 211165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2017-01-25 22:05:02 UTC (rev 211164)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2017-01-25 22:31:24 UTC (rev 211165)
</span><span class="lines">@@ -1253,6 +1253,10 @@
</span><span class="cx">
</span><span class="cx"> bool canPluginHandleResponse(const WebCore::ResourceResponse&);
</span><span class="cx">
</span><ins>+#if USE(QUICK_LOOK)
+ void didReceivePasswordForQuickLookDocument(const String&);
+#endif
+
</ins><span class="cx"> uint64_t m_pageID;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<WebCore::Page> m_page;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (211164 => 211165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2017-01-25 22:05:02 UTC (rev 211164)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2017-01-25 22:31:24 UTC (rev 211165)
</span><span class="lines">@@ -464,4 +464,8 @@
</span><span class="cx"> #if ENABLE(GAMEPAD)
</span><span class="cx"> GamepadActivity(Vector<WebKit::GamepadData> gamepadDatas, bool shouldMakeGamepadsVisible)
</span><span class="cx"> #endif
</span><ins>+
+#if USE(QUICK_LOOK)
+ DidReceivePasswordForQuickLookDocument(String password)
+#endif
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (211164 => 211165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2017-01-25 22:05:02 UTC (rev 211164)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2017-01-25 22:31:24 UTC (rev 211165)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx"> #import "WebKitSystemInterface.h"
</span><span class="cx"> #import "WebPageProxyMessages.h"
</span><span class="cx"> #import "WebProcess.h"
</span><ins>+#import "WebQuickLookHandleClient.h"
</ins><span class="cx"> #import <CoreText/CTFont.h>
</span><span class="cx"> #import <WebCore/Autofill.h>
</span><span class="cx"> #import <WebCore/Chrome.h>
</span><span class="lines">@@ -3173,6 +3174,13 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if USE(QUICK_LOOK)
+void WebPage::didReceivePasswordForQuickLookDocument(const String& password)
+{
+ WebQuickLookHandleClient::didReceivePassword(password, m_pageID);
+}
+#endif
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre>
</div>
</div>
</body>
</html>