Changeset 246201 in webkit

Timestamp:

Jun 7, 2019 8:44:04 AM (5 years ago)

Author:

aestes@apple.com

Message:

process-swap-on-navigation error when loading blocked website on iOS 12.2 only.
​https://bugs.webkit.org/show_bug.cgi?id=196930
<rdar://problem/47819301>

Reviewed by Chris Dumez.

The ContentFilterDidBlockLoadForFrame message needs to be handled by ProvisionalPageProxy in
order to look up the blocked frame in the correct WebProcessProxy.

• UIProcess/Cocoa/WebPageProxyCocoa.mm:

(WebKit::WebPageProxy::contentFilterDidBlockLoadForFrame):
(WebKit::WebPageProxy::contentFilterDidBlockLoadForFrameShared):

• UIProcess/ProvisionalPageProxy.cpp:

(WebKit::ProvisionalPageProxy::contentFilterDidBlockLoadForFrame):
(WebKit::ProvisionalPageProxy::didReceiveMessage):

• UIProcess/ProvisionalPageProxy.h:
• UIProcess/WebPageProxy.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/WebPageProxyCocoa.mm (modified) (1 diff)
• UIProcess/ProvisionalPageProxy.cpp (modified) (2 diffs)
• UIProcess/ProvisionalPageProxy.h (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-07  Andy Estes  <aestes@apple.com>
+
+        process-swap-on-navigation error when loading blocked website on iOS 12.2 only.
+        https://bugs.webkit.org/show_bug.cgi?id=196930
+        <rdar://problem/47819301>
+
+        Reviewed by Chris Dumez.
+
+        The ContentFilterDidBlockLoadForFrame message needs to be handled by ProvisionalPageProxy in
+        order to look up the blocked frame in the correct WebProcessProxy.
+
+        * UIProcess/Cocoa/WebPageProxyCocoa.mm:
+        (WebKit::WebPageProxy::contentFilterDidBlockLoadForFrame):
+        (WebKit::WebPageProxy::contentFilterDidBlockLoadForFrameShared):
+        * UIProcess/ProvisionalPageProxy.cpp:
+        (WebKit::ProvisionalPageProxy::contentFilterDidBlockLoadForFrame):
+        (WebKit::ProvisionalPageProxy::didReceiveMessage):
+        * UIProcess/ProvisionalPageProxy.h:
+        * UIProcess/WebPageProxy.h:
+
 2019-06-07  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm

@@ -104 +104 @@
 void WebPageProxy::contentFilterDidBlockLoadForFrame(const WebCore::ContentFilterUnblockHandler& unblockHandler, uint64_t frameID)
 {
-    if (WebFrameProxy* frame = m_process->webFrame(frameID))
+    contentFilterDidBlockLoadForFrameShared(m_process.copyRef(), unblockHandler, frameID);
+}
+
+void WebPageProxy::contentFilterDidBlockLoadForFrameShared(Ref<WebProcessProxy>&& process, const WebCore::ContentFilterUnblockHandler& unblockHandler, uint64_t frameID)
+{
+    if (WebFrameProxy* frame = process->webFrame(frameID))
         frame->contentFilterDidBlockLoad(unblockHandler);
 }

trunk/Source/WebKit/UIProcess/ProvisionalPageProxy.cpp

@@ -377 +377 @@
 #endif
 
+#if ENABLE(CONTENT_FILTERING)
+void ProvisionalPageProxy::contentFilterDidBlockLoadForFrame(const WebCore::ContentFilterUnblockHandler& unblockHandler, uint64_t frameID)
+{
+    m_page.contentFilterDidBlockLoadForFrameShared(m_process.copyRef(), unblockHandler, frameID);
+}
+#endif
+
 void ProvisionalPageProxy::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
 {
@@ -475 +482 @@
 #endif
 
+#if ENABLE(CONTENT_FILTERING)
+    if (decoder.messageName() == Messages::WebPageProxy::ContentFilterDidBlockLoadForFrame::name()) {
+        IPC::handleMessage<Messages::WebPageProxy::ContentFilterDidBlockLoadForFrame>(decoder, this, &ProvisionalPageProxy::contentFilterDidBlockLoadForFrame);
+        return;
+    }
+#endif
+
     LOG(ProcessSwapping, "Unhandled message %s::%s from provisional process", decoder.messageReceiverName().toString().data(), decoder.messageName().toString().data());
 }

trunk/Source/WebKit/UIProcess/ProvisionalPageProxy.h

@@ -119 +119 @@
     void registerWebProcessAccessibilityToken(const IPC::DataReference&);
 #endif
+#if ENABLE(CONTENT_FILTERING)
+    void contentFilterDidBlockLoadForFrame(const WebCore::ContentFilterUnblockHandler&, uint64_t frameID);
+#endif
 
     void initializeWebPage();

trunk/Source/WebKit/UIProcess/WebPageProxy.h

@@ -1522 +1522 @@
     void didRequestPasswordForQuickLookDocumentInMainFrameShared(Ref<WebProcessProxy>&&, const String& fileName);
 #endif
+#if ENABLE(CONTENT_FILTERING)
+    void contentFilterDidBlockLoadForFrameShared(Ref<WebProcessProxy>&&, const WebCore::ContentFilterUnblockHandler&, uint64_t frameID);
+#endif
 
     void dumpAdClickAttribution(CompletionHandler<void(const String&)>&&);