Changeset 246190 in webkit

Timestamp:

Jun 6, 2019 11:09:40 PM (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.

When the content filter blocks a navigation, it will continue to load the content filter
error page in the provisional web process. When dispatching didFailProvisionalLoad, we need
to specify WillContinueLoading::Yes so that WebKit presents the error page rather than
switching back to the committed web process.

Testing blocked by <​https://webkit.org/b/198626>.

• loader/ContentFilter.cpp:

(WebCore::ContentFilter::willHandleProvisionalLoadFailure):
(WebCore::ContentFilter::handleProvisionalLoadFailure):

• loader/ContentFilter.h:
• loader/FrameLoader.cpp:

(WebCore::FrameLoader::dispatchDidFailProvisionalLoad):
(WebCore::FrameLoader::checkLoadCompleteForThisFrame):

• loader/FrameLoader.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/ContentFilter.cpp (modified) (1 diff)
• loader/ContentFilter.h (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (2 diffs)
• loader/FrameLoader.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-06  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.
+
+        When the content filter blocks a navigation, it will continue to load the content filter
+        error page in the provisional web process. When dispatching didFailProvisionalLoad, we need
+        to specify WillContinueLoading::Yes so that WebKit presents the error page rather than
+        switching back to the committed web process.
+
+        Testing blocked by <https://webkit.org/b/198626>.
+
+        * loader/ContentFilter.cpp:
+        (WebCore::ContentFilter::willHandleProvisionalLoadFailure):
+        (WebCore::ContentFilter::handleProvisionalLoadFailure):
+        * loader/ContentFilter.h:
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::dispatchDidFailProvisionalLoad):
+        (WebCore::FrameLoader::checkLoadCompleteForThisFrame):
+        * loader/FrameLoader.h:
+
 2019-06-06  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/loader/ContentFilter.cpp

@@ -275 +275 @@
 }
 
+bool ContentFilter::willHandleProvisionalLoadFailure(const ResourceError& error) const
+{
+    if (m_state != State::Blocked)
+        return false;
+
+    if (m_blockedError.errorCode() != error.errorCode() || m_blockedError.domain() != error.domain())
+        return false;
+
+    ASSERT(m_blockedError.failingURL() == error.failingURL());
+    return true;
+}
+
 void ContentFilter::handleProvisionalLoadFailure(const ResourceError& error)
 {
-    if (m_state != State::Blocked)
-        return;
-
-    if (m_blockedError.errorCode() != error.errorCode() || m_blockedError.domain() != error.domain())
-        return;
-
-    ASSERT(m_blockedError.failingURL() == error.failingURL());
+    ASSERT(willHandleProvisionalLoadFailure(error));
 
     RefPtr<SharedBuffer> replacementData { m_blockingContentFilter->replacementData() };

trunk/Source/WebCore/loader/ContentFilter.h

@@ -63 +63 @@
 
     static bool continueAfterSubstituteDataRequest(const DocumentLoader& activeLoader, const SubstituteData&);
+    bool willHandleProvisionalLoadFailure(const ResourceError&) const;
     void handleProvisionalLoadFailure(const ResourceError&);
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -2428 +2428 @@
 }
 
+void FrameLoader::dispatchDidFailProvisionalLoad(DocumentLoader& provisionalDocumentLoader, const ResourceError& error)
+{
+    m_provisionalLoadErrorBeingHandledURL = provisionalDocumentLoader.url();
+
+#if ENABLE(CONTENT_FILTERING)
+    auto contentFilter = provisionalDocumentLoader.contentFilter();
+    auto contentFilterWillContinueLoading = false;
+#endif
+
+    auto willContinueLoading = WillContinueLoading::No;
+    if (history().provisionalItem())
+        willContinueLoading = WillContinueLoading::Yes;
+#if ENABLE(CONTENT_FILTERING)
+    if (contentFilter && contentFilter->willHandleProvisionalLoadFailure(error)) {
+        willContinueLoading = WillContinueLoading::Yes;
+        contentFilterWillContinueLoading = true;
+    }
+#endif
+
+    m_client.dispatchDidFailProvisionalLoad(error, willContinueLoading);
+
+#if ENABLE(CONTENT_FILTERING)
+    if (contentFilterWillContinueLoading)
+        contentFilter->handleProvisionalLoadFailure(error);
+#endif
+
+    m_provisionalLoadErrorBeingHandledURL = { };
+}
+
 void FrameLoader::checkLoadCompleteForThisFrame()
 {
@@ -2466 +2495 @@
             if (!pdl->isLoadingInAPISense() || pdl->isStopping()) {
                 RELEASE_LOG_IF_ALLOWED("checkLoadCompleteForThisFrame: Failed provisional load (frame = %p, main = %d, isTimeout = %d, isCancellation = %d, errorCode = %d)", &m_frame, m_frame.isMainFrame(), error.isTimeout(), error.isCancellation(), error.errorCode());
-                m_provisionalLoadErrorBeingHandledURL = m_provisionalDocumentLoader->url();
-
-                m_client.dispatchDidFailProvisionalLoad(error, history().provisionalItem() ? WillContinueLoading::Yes : WillContinueLoading::No);
-#if ENABLE(CONTENT_FILTERING)
-                if (auto contentFilter = pdl->contentFilter())
-                    contentFilter->handleProvisionalLoadFailure(error);
-#endif
-                m_provisionalLoadErrorBeingHandledURL = { };
-
+
+                dispatchDidFailProvisionalLoad(*pdl, error);
                 ASSERT(!pdl->isLoading());
 

trunk/Source/WebCore/loader/FrameLoader.h

@@ -362 +362 @@
     void scrollToFragmentWithParentBoundary(const URL&, bool isNewNavigation = true);
 
+    void dispatchDidFailProvisionalLoad(DocumentLoader& provisionalDocumentLoader, const ResourceError&);
     void checkLoadCompleteForThisFrame();