Attachment 369274 Details for Bug 197655 – Patch

[patch] Patch

wd-script-alert.diff (text/plain), 1.77 KB, created by Carlos Garcia Campos on 2019-05-07 04:08:57 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2019-05-07 04:08:57 PDT

Size: 1.77 KB

patch

obsolete

>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 4525f275912..f329d32efaa 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-05-07  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        REGRESSION(r244230): Web Automation: use null instead of empty string as success result of scripts when alert is open
>+        https://bugs.webkit.org/show_bug.cgi?id=197655
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This regressed in r244230, the case of an alert open while running a script is now handled in WebKit side, but
>+        an empty string is returned as a result, which is not a valid JSON serialized string. That made all user prompts
>+        tests to fail.
>+
>+        * UIProcess/Automation/WebAutomationSession.cpp:
>+        (WebKit::WebAutomationSession::willShowJavaScriptDialog): Use null as script result instead of an empty string.
>+
> 2019-05-07  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         [GTK] Crash in webkitWebViewBaseSetEnableBackForwardNavigationGesture
>diff --git a/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp b/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp
>index 018bf91acff..c25b9517717 100644
>--- a/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp
>+++ b/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp
>@@ -654,7 +654,7 @@ void WebAutomationSession::willShowJavaScriptDialog(WebPageProxy& page)
>         if (!m_evaluateJavaScriptFunctionCallbacks.isEmpty()) {
>             for (auto key : copyToVector(m_evaluateJavaScriptFunctionCallbacks.keys())) {
>                 auto callback = m_evaluateJavaScriptFunctionCallbacks.take(key);
>-                callback->sendSuccess(emptyString());
>+                callback->sendSuccess("null"_s);
>             }
>         }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 197655: 369274