Attachment 371820 Details for Bug 198741 – Patch

[patch] Patch

bug-198741-20190610220502.patch (text/plain), 4.24 KB, created by Devin Rousso on 2019-06-10 22:05:03 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-06-10 22:05:03 PDT

Size: 4.24 KB

patch

obsolete

>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index f6b7f042419051872dbcede8a22fa68b4b0b7c1b..06517d2d817d678781558f96945e8e22e3cd3b3c 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,33 @@
>+2019-06-10  Devin Rousso  <drousso@apple.com>
>+
>+        waitForNavigationToComplete may be called before WebPageProxy knows it's loading
>+        https://bugs.webkit.org/show_bug.cgi?id=198741
>+        <rdar://problem/31164316>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        If the timing of the communications to the `WebPageProxy` about the fact that it's actually
>+        `PageLoadingState::isLoading` is too "slow" or happens after
>+        `WebAutomationSession::waitForNavigationToCompleteOnPage` is called, the automation session
>+        will continue running commands, which can lead to a JavaScript error ("Callback was not
>+        called before the unload event") as any injected scripts will be cleared by the impending
>+        navigation, leaving the script evaluation callbacks "dangling".
>+
>+        Expose more information from `PageLoadState` about whether it thinks there's a navigation
>+        currently happening, in addition to the existing "we've committed to a navigation". If a
>+        navigation "might" be happening, still wait for it to complete before continuing.
>+
>+        In the best case, no navigations are "missed".
>+
>+        In the worst case, the automation session will wait `pageLoadTimeout` before continuing.
>+
>+        * UIProcess/Automation/WebAutomationSession.cpp:
>+        (WebKit::WebAutomationSession::waitForNavigationToCompleteOnPage):
>+
>+        * UIProcess/PageLoadState.h:
>+        * UIProcess/PageLoadState.cpp:
>+        (WebKit::PageLoadState::isLoadingUncommitted const): Added.
>+
> 2019-06-10  Sam Weinig  <weinig@apple.com>
> 
>         Remove Dashboard support
>diff --git a/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp b/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp
>index 2f9cfe9424026172d906dbd1a03c4cd01544bb8b..8289dd89052967ca3c8aada236675c7eaf84ffc8 100644
>--- a/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp
>+++ b/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp
>@@ -484,7 +484,7 @@ void WebAutomationSession::waitForNavigationToComplete(const String& browsingCon
> void WebAutomationSession::waitForNavigationToCompleteOnPage(WebPageProxy& page, Inspector::Protocol::Automation::PageLoadStrategy loadStrategy, Seconds timeout, Ref<Inspector::BackendDispatcher::CallbackBase>&& callback)
> {
>     ASSERT(!m_loadTimer.isActive());
>-    if (loadStrategy == Inspector::Protocol::Automation::PageLoadStrategy::None || !page.pageLoadState().isLoading()) {
>+    if (loadStrategy == Inspector::Protocol::Automation::PageLoadStrategy::None || (!page.pageLoadState().isLoading() && !page.pageLoadState().isLoadingUncommitted())) {
>         callback->sendSuccess(JSON::Object::create());
>         return;
>     }
>diff --git a/Source/WebKit/UIProcess/PageLoadState.cpp b/Source/WebKit/UIProcess/PageLoadState.cpp
>index d10148bacb7f47f2987dffa196be6907921448e2..c3afc31ba586b496012ea42a98e75c166e4ba84c 100644
>--- a/Source/WebKit/UIProcess/PageLoadState.cpp
>+++ b/Source/WebKit/UIProcess/PageLoadState.cpp
>@@ -172,6 +172,11 @@ bool PageLoadState::isLoading() const
>     return isLoading(m_committedState);
> }
> 
>+bool PageLoadState::isLoadingUncommitted() const
>+{
>+    return isLoading(m_uncommittedState);
>+}
>+
> String PageLoadState::activeURL(const Data& data)
> {
>     // If there is a currently pending URL, it is the active URL,
>diff --git a/Source/WebKit/UIProcess/PageLoadState.h b/Source/WebKit/UIProcess/PageLoadState.h
>index 652d360f83b1ebc4cacf6bc94a418d09d19f1c1c..6916e6c3530fc8dad052fb7a117f6a6e50b112f2 100644
>--- a/Source/WebKit/UIProcess/PageLoadState.h
>+++ b/Source/WebKit/UIProcess/PageLoadState.h
>@@ -125,6 +125,8 @@ public:
>     bool isCommitted() const { return m_committedState.state == State::Committed; }
>     bool isFinished() const { return m_committedState.state == State::Finished; }
> 
>+    bool isLoadingUncommitted() const;
>+
>     const String& provisionalURL() const { return m_committedState.provisionalURL; }
>     const String& url() const { return m_committedState.url; }
>     const String& unreachableURL() const { return m_committedState.unreachableURL; }

Actions: View | Formatted Diff | Diff

Attachments on bug 198741: 371820 | 372102 | 372169