Attachment 369259 Details for Bug 197651 – Patch

[patch] Patch

mb-automation-blank.diff (text/plain), 2.57 KB, created by Carlos Garcia Campos on 2019-05-07 02:15:25 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2019-05-07 02:15:25 PDT

Size: 2.57 KB

patch

obsolete

>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 806e0b1b8ca..47585fa8da8 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-05-07  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        [GTK][WPE] MiniBrowser: load about:blank for new web views in automation mode
>+        https://bugs.webkit.org/show_bug.cgi?id=197651
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This is required since the process creation was delayed until something is loaded in the view.
>+
>+        * MiniBrowser/gtk/BrowserWindow.c:
>+        (browser_window_get_or_create_web_view_for_automation):
>+        * MiniBrowser/wpe/main.cpp:
>+        (main):
>+
> 2019-05-04  Alex Christensen  <achristensen@webkit.org>
> 
>         Revert r244953 and r244954 because they broke internal builds.
>diff --git a/Tools/MiniBrowser/gtk/BrowserWindow.c b/Tools/MiniBrowser/gtk/BrowserWindow.c
>index 4cda5eda03b..7fb3abd0768 100644
>--- a/Tools/MiniBrowser/gtk/BrowserWindow.c
>+++ b/Tools/MiniBrowser/gtk/BrowserWindow.c
>@@ -1231,8 +1231,10 @@ WebKitWebView *browser_window_get_or_create_web_view_for_automation(void)
> 
>     BrowserWindow *window = (BrowserWindow *)windowList->data;
>     WebKitWebView *webView = browser_tab_get_web_view(window->activeTab);
>-    if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(window->notebook)) == 1 && !webkit_web_view_get_uri(webView))
>+    if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(window->notebook)) == 1 && !webkit_web_view_get_uri(webView)) {
>+        webkit_web_view_load_uri(webView, "about:blank");
>         return webView;
>+    }
> 
>     WebKitWebView *newWebView = WEBKIT_WEB_VIEW(g_object_new(WEBKIT_TYPE_WEB_VIEW,
>         "web-context", webkit_web_view_get_context(webView),
>@@ -1241,6 +1243,7 @@ WebKitWebView *browser_window_get_or_create_web_view_for_automation(void)
>         "is-controlled-by-automation", TRUE,
>         NULL));
>     browser_window_append_view(window, newWebView);
>+    webkit_web_view_load_uri(newWebView, "about:blank");
>     gtk_widget_grab_focus(GTK_WIDGET(newWebView));
>     return newWebView;
> }
>diff --git a/Tools/MiniBrowser/wpe/main.cpp b/Tools/MiniBrowser/wpe/main.cpp
>index 1b3bf3dba82..be6460e56b7 100644
>--- a/Tools/MiniBrowser/wpe/main.cpp
>+++ b/Tools/MiniBrowser/wpe/main.cpp
>@@ -275,7 +275,9 @@ int main(int argc, char *argv[])
>         g_object_unref(file);
>         webkit_web_view_load_uri(webView, url);
>         g_free(url);
>-    } else if (!automationMode)
>+    } else if (automationMode)
>+        webkit_web_view_load_uri(webView, "about:blank");
>+    else
>         webkit_web_view_load_uri(webView, "https://wpewebkit.org");
> 
>     g_main_loop_run(loop);

Flags:

zan: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 197651: 369259