Title: [231408] releases/WebKitGTK/webkit-2.20/Source/WebKit
Revision
231408
Author
[email protected]
Date
2018-05-07 00:46:37 -0700 (Mon, 07 May 2018)

Log Message

Merge r230481 - [GTK][WPE] Race condition when destroying webprocesses
https://bugs.webkit.org/show_bug.cgi?id=184445

Reviewed by Carlos Garcia Campos.

Ensure that the WebProcess is properly closing its pages when it's exiting because
the UIProcess has invalidated the IPC connection.

* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::didClose):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog (231407 => 231408)


--- releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog	2018-05-07 07:46:34 UTC (rev 231407)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog	2018-05-07 07:46:37 UTC (rev 231408)
@@ -1,3 +1,16 @@
+2018-04-10  Miguel Gomez  <[email protected]>
+
+        [GTK][WPE] Race condition when destroying webprocesses
+        https://bugs.webkit.org/show_bug.cgi?id=184445
+
+        Reviewed by Carlos Garcia Campos.
+
+        Ensure that the WebProcess is properly closing its pages when it's exiting because
+        the UIProcess has invalidated the IPC connection.
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::didClose):
+
 2018-05-03  Carlos Garcia Campos  <[email protected]>
 
         REGRESSION(r222772): [GTK][WPE] WebProcess from WebKitGtk+ 2.19.9x SIGSEVs in WebKit::WebProcess::ensureNetworkProcessConnection() at Source/WebKit/WebProcess/WebProcess.cpp:1127

Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/WebProcess/WebProcess.cpp (231407 => 231408)


--- releases/WebKitGTK/webkit-2.20/Source/WebKit/WebProcess/WebProcess.cpp	2018-05-07 07:46:34 UTC (rev 231407)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/WebProcess/WebProcess.cpp	2018-05-07 07:46:37 UTC (rev 231408)
@@ -664,10 +664,12 @@
 
 void WebProcess::didClose(IPC::Connection&)
 {
-#ifndef NDEBUG
+#if !defined(NDEBUG) || PLATFORM(GTK) || PLATFORM(WPE)
     for (auto& page : copyToVector(m_pageMap.values()))
         page->close();
+#endif
 
+#ifndef NDEBUG
     GCController::singleton().garbageCollectSoon();
     FontCache::singleton().invalidate();
     MemoryCache::singleton().setDisabled(true);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to