Attachment 362736 Details for Bug 194954 – Patch

[patch] Patch

bug-194954-20190222113842.patch (text/plain), 6.96 KB, created by Chris Dumez on 2019-02-22 11:38:43 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2019-02-22 11:38:43 PST

Size: 6.96 KB

patch

obsolete

>Subversion Revision: 241950
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index c047f2bdb7595098fed11de092d0fb12a985cea3..e2a55bac7cfaa40e9168abcf72fe248bc2d689a4 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,23 @@
>+2019-02-22  Chris Dumez  <cdumez@apple.com>
>+
>+        Regression(PSON) Unable to preview password-protected documents on iCloud.com
>+        https://bugs.webkit.org/show_bug.cgi?id=194954
>+        <rdar://problem/48127957>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Make sure the ProvisionalPageProxy forwards to the WebPageProxy the QuickLook-related
>+        IPC on iOS.
>+
>+        * UIProcess/ProvisionalPageProxy.cpp:
>+        (WebKit::ProvisionalPageProxy::didRequestPasswordForQuickLookDocumentInMainFrame):
>+        (WebKit::ProvisionalPageProxy::didReceiveMessage):
>+        * UIProcess/ProvisionalPageProxy.h:
>+        * UIProcess/WebPageProxy.h:
>+        * UIProcess/ios/WebPageProxyIOS.mm:
>+        (WebKit::WebPageProxy::didRequestPasswordForQuickLookDocumentInMainFrame):
>+        (WebKit::WebPageProxy::didRequestPasswordForQuickLookDocumentInMainFrameShared):
>+
> 2019-02-22  Chris Dumez  <cdumez@apple.com>
> 
>         REGRESSION(PSON) Scroll position is sometimes not restored on history navigation
>diff --git a/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp b/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp
>index eb299a87b7555f03cc8e25dd1992c95a0f4739f2..d4bdcc4eca33ca8ee30a93e9cfe4604f81ac63ec 100644
>--- a/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp
>+++ b/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp
>@@ -327,6 +327,13 @@ void ProvisionalPageProxy::decidePolicyForNavigationActionSync(uint64_t frameID,
>         WTFMove(frameInfoData), originatingPageID, originalRequest, WTFMove(request), WTFMove(requestBody), WTFMove(redirectResponse), userData, WTFMove(reply));
> }
> 
>+#if USE(QUICK_LOOK)
>+void ProvisionalPageProxy::didRequestPasswordForQuickLookDocumentInMainFrame(const String& fileName)
>+{
>+    m_page.didRequestPasswordForQuickLookDocumentInMainFrameShared(m_process.copyRef(), fileName);
>+}
>+#endif
>+
> #if PLATFORM(COCOA)
> void ProvisionalPageProxy::registerWebProcessAccessibilityToken(const IPC::DataReference& data)
> {
>@@ -344,6 +351,10 @@ void ProvisionalPageProxy::didReceiveMessage(IPC::Connection& connection, IPC::D
>         || decoder.messageName() == Messages::WebPageProxy::LogDiagnosticMessage::name()
>         || decoder.messageName() == Messages::WebPageProxy::LogDiagnosticMessageWithEnhancedPrivacy::name()
>         || decoder.messageName() == Messages::WebPageProxy::SetNetworkRequestsInProgress::name()
>+#if USE(QUICK_LOOK)
>+        || decoder.messageName() == Messages::WebPageProxy::DidStartLoadForQuickLookDocumentInMainFrame::name()
>+        || decoder.messageName() == Messages::WebPageProxy::DidFinishLoadForQuickLookDocumentInMainFrame::name()
>+#endif
>         )
>     {
>         m_page.didReceiveMessage(connection, decoder);
>@@ -417,6 +428,13 @@ void ProvisionalPageProxy::didReceiveMessage(IPC::Connection& connection, IPC::D
>         return;
>     }
> 
>+#if USE(QUICK_LOOK)
>+    if (decoder.messageName() == Messages::WebPageProxy::DidRequestPasswordForQuickLookDocumentInMainFrame::name()) {
>+        IPC::handleMessage<Messages::WebPageProxy::DidRequestPasswordForQuickLookDocumentInMainFrame>(decoder, this, &ProvisionalPageProxy::didRequestPasswordForQuickLookDocumentInMainFrame);
>+        return;
>+    }
>+#endif
>+
>     LOG(ProcessSwapping, "Unhandled message %s::%s from provisional process", decoder.messageReceiverName().toString().data(), decoder.messageName().toString().data());
> }
> 
>diff --git a/Source/WebKit/UIProcess/ProvisionalPageProxy.h b/Source/WebKit/UIProcess/ProvisionalPageProxy.h
>index c42fe6df4bad88c09bd484ee63b63f044edc4590..5db98867610d4e2a1cfe08f11e2bd81be878a373 100644
>--- a/Source/WebKit/UIProcess/ProvisionalPageProxy.h
>+++ b/Source/WebKit/UIProcess/ProvisionalPageProxy.h
>@@ -105,6 +105,9 @@ private:
>     void decidePolicyForNavigationActionSync(uint64_t frameID, bool isMainFrame, WebCore::SecurityOriginData&&, WebCore::PolicyCheckIdentifier, uint64_t navigationID, NavigationActionData&&,
>         FrameInfoData&&, uint64_t originatingPageID, const WebCore::ResourceRequest& originalRequest, WebCore::ResourceRequest&&, IPC::FormDataReference&& requestBody,
>         WebCore::ResourceResponse&& redirectResponse, const UserData&, Messages::WebPageProxy::DecidePolicyForNavigationActionSync::DelayedReply&&);
>+#if USE(QUICK_LOOK)
>+    void didRequestPasswordForQuickLookDocumentInMainFrame(const String& fileName);
>+#endif
> #if PLATFORM(COCOA)
>     void registerWebProcessAccessibilityToken(const IPC::DataReference&);
> #endif
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
>index 70e81d52e8e0a658886653ccf0b32eccef628f7a..d4f17f0f3061ecfbabd1778de0e4a7e81bb0ae1c 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.h
>+++ b/Source/WebKit/UIProcess/WebPageProxy.h
>@@ -1458,6 +1458,9 @@ public:
>     void decidePolicyForNavigationActionSyncShared(Ref<WebProcessProxy>&&, uint64_t frameID, bool isMainFrame, WebCore::SecurityOriginData&&, WebCore::PolicyCheckIdentifier, uint64_t navigationID, NavigationActionData&&,
>         FrameInfoData&&, uint64_t originatingPageID, const WebCore::ResourceRequest& originalRequest, WebCore::ResourceRequest&&, IPC::FormDataReference&& requestBody,
>         WebCore::ResourceResponse&& redirectResponse, const UserData&, Messages::WebPageProxy::DecidePolicyForNavigationActionSync::DelayedReply&&);
>+#if USE(QUICK_LOOK)
>+    void didRequestPasswordForQuickLookDocumentInMainFrameShared(Ref<WebProcessProxy>&&, const String& fileName);
>+#endif
> 
>     void dumpAdClickAttribution(CompletionHandler<void(const String&)>&&);
>     void clearAdClickAttribution(CompletionHandler<void()>&&);
>diff --git a/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm b/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm
>index ffe39952a3800e73f50e1e81a1353de9759f8b6b..17b4ad36f482ead799700f17f8c6943ca7c9afdd 100644
>--- a/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm
>+++ b/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm
>@@ -1159,8 +1159,13 @@ void WebPageProxy::didFinishLoadForQuickLookDocumentInMainFrame(const QuickLookD
> 
> void WebPageProxy::didRequestPasswordForQuickLookDocumentInMainFrame(const String& fileName)
> {
>-    pageClient().requestPasswordForQuickLookDocument(fileName, [protectedThis = makeRef(*this)](const String& password) {
>-        protectedThis->process().send(Messages::WebPage::DidReceivePasswordForQuickLookDocument(password), protectedThis->m_pageID);
>+    didRequestPasswordForQuickLookDocumentInMainFrameShared(m_process.copyRef(), fileName);
>+}
>+
>+void WebPageProxy::didRequestPasswordForQuickLookDocumentInMainFrameShared(Ref<WebProcessProxy>&& process, const String& fileName)
>+{
>+    pageClient().requestPasswordForQuickLookDocument(fileName, [protectedThis = makeRef(*this), process = WTFMove(process)](const String& password) {
>+        process->send(Messages::WebPage::DidReceivePasswordForQuickLookDocument(password), protectedThis->m_pageID);
>     });
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 194954: 362736 | 362745 | 362750 | 362753 | 362754