Title: [257993] releases/WebKitGTK/webkit-2.28/Tools
Revision
257993
Author
carlo...@webkit.org
Date
2020-03-06 06:28:55 -0800 (Fri, 06 Mar 2020)

Log Message

Merge r257973 - [WPE][WebDriver] MiniBrowser should react to close session commands
https://bugs.webkit.org/show_bug.cgi?id=207529

Reviewed by Carlos Garcia Campos.

Do not call g_object_unref on the first created view if it has already
been disposed in the "close" signal handler.

Based on original patch by Yury Semikhatsky.

* MiniBrowser/wpe/main.cpp:
(main):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.28/Tools/ChangeLog (257992 => 257993)


--- releases/WebKitGTK/webkit-2.28/Tools/ChangeLog	2020-03-06 14:28:52 UTC (rev 257992)
+++ releases/WebKitGTK/webkit-2.28/Tools/ChangeLog	2020-03-06 14:28:55 UTC (rev 257993)
@@ -1,3 +1,18 @@
+2020-03-06  Lauro Moura <lmo...@igalia.com>
+
+        [WPE][WebDriver] MiniBrowser should react to close session commands
+        https://bugs.webkit.org/show_bug.cgi?id=207529
+
+        Reviewed by Carlos Garcia Campos.
+
+        Do not call g_object_unref on the first created view if it has already
+        been disposed in the "close" signal handler.
+
+        Based on original patch by Yury Semikhatsky.
+
+        * MiniBrowser/wpe/main.cpp:
+        (main):
+
 2020-03-06  Michael Catanzaro  <mcatanz...@gnome.org>
 
         [WPE][GTK] Use Firefox user agent quirk more aggressively on Google Docs

Modified: releases/WebKitGTK/webkit-2.28/Tools/MiniBrowser/wpe/main.cpp (257992 => 257993)


--- releases/WebKitGTK/webkit-2.28/Tools/MiniBrowser/wpe/main.cpp	2020-03-06 14:28:52 UTC (rev 257992)
+++ releases/WebKitGTK/webkit-2.28/Tools/MiniBrowser/wpe/main.cpp	2020-03-06 14:28:55 UTC (rev 257993)
@@ -288,6 +288,7 @@
         "is-controlled-by-automation", automationMode,
         nullptr));
     g_object_unref(settings);
+    g_object_add_weak_pointer(G_OBJECT(webView), reinterpret_cast<void**>(&webView));
 
     backendPtr->setInputClient(std::make_unique<InputClient>(loop, webView));
 #if defined(HAVE_ACCESSIBILITY) && HAVE_ACCESSIBILITY
@@ -325,7 +326,10 @@
 
     g_main_loop_run(loop);
 
-    g_object_unref(webView);
+    if (webView) {
+        g_object_remove_weak_pointer(G_OBJECT(webView), reinterpret_cast<void**>(&webView));
+        g_object_unref(webView);
+    }
     if (privateMode || automationMode)
         g_object_unref(webContext);
     g_main_loop_unref(loop);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to