Title: [259970] releases/WebKitGTK/webkit-2.28/Source/WebKit
Revision
259970
Author
[email protected]
Date
2020-04-12 06:16:58 -0700 (Sun, 12 Apr 2020)

Log Message

Merge r259942 - [GTK][PSON] Crash in WaylandCompositor::Surface destructor with USE_WPE_RENDERER disabled
https://bugs.webkit.org/show_bug.cgi?id=209345

Reviewed by Michael Catanzaro.

In case of PSON the web page identifier can change fo the same web page proxy. When swapping processes the new
web page calls bindSurfaceToWebPage(), but we still have the web page proxy bound to the previous surface. We
just need to unbind the current surface before binding the new one.

* UIProcess/gtk/WaylandCompositor.cpp:
(WebKit::WaylandCompositor::bindSurfaceToWebPage):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog (259969 => 259970)


--- releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog	2020-04-12 13:16:54 UTC (rev 259969)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog	2020-04-12 13:16:58 UTC (rev 259970)
@@ -1,3 +1,17 @@
+2020-04-12  Carlos Garcia Campos  <[email protected]>
+
+        [GTK][PSON] Crash in WaylandCompositor::Surface destructor with USE_WPE_RENDERER disabled
+        https://bugs.webkit.org/show_bug.cgi?id=209345
+
+        Reviewed by Michael Catanzaro.
+
+        In case of PSON the web page identifier can change fo the same web page proxy. When swapping processes the new
+        web page calls bindSurfaceToWebPage(), but we still have the web page proxy bound to the previous surface. We
+        just need to unbind the current surface before binding the new one.
+
+        * UIProcess/gtk/WaylandCompositor.cpp:
+        (WebKit::WaylandCompositor::bindSurfaceToWebPage):
+
 2020-03-23  Chris Lord  <[email protected]>
 
         [WPE] AsyncScrolling: horizontal scrolling is inverted

Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp (259969 => 259970)


--- releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp	2020-04-12 13:16:54 UTC (rev 259969)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp	2020-04-12 13:16:58 UTC (rev 259970)
@@ -566,6 +566,7 @@
     if (!webPage)
         return;
 
+    unbindWebPage(*webPage);
     surface->setWebPage(webPage);
     m_pageMap.set(webPage, makeWeakPtr(*surface));
 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to