Merge r220793 - [GTK] Crash of WebProcess with on-demand AC

https://bugs.webkit.org/show_bug.cgi?id=171161 Reviewed by Carlos Garcia Campos. Set the viewOverlayRootLayer to the previous layerTreeHost if it exists. This avoids a crash when reusing the previous layerTreeHost, because it would keep a reference to an already destroyed viewOverlayRootLayer. * WebProcess/WebPage/AcceleratedDrawingArea.cpp: (WebKit::AcceleratedDrawingArea::attachViewOverlayGraphicsLayer):
WebKit · Aug 17, 2017 · fb5873b · fb5873b
1 parent eb12c6d
commit fb5873b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2017-08-16  Miguel Gomez  <magomez@igalia.com>
+
+        [GTK] Crash of WebProcess with on-demand AC
+        https://bugs.webkit.org/show_bug.cgi?id=171161
+
+        Reviewed by Carlos Garcia Campos.
+
+        Set the viewOverlayRootLayer to the previous layerTreeHost if it exists. This avoids a
+        crash when reusing the previous layerTreeHost, because it would keep a reference to an
+        already destroyed viewOverlayRootLayer.
+
+        * WebProcess/WebPage/AcceleratedDrawingArea.cpp:
+        (WebKit::AcceleratedDrawingArea::attachViewOverlayGraphicsLayer):
+
 2017-08-16  Zan Dobersek  <zdobersek@igalia.com>
 
         [CoordGraphics] Simplify CoordinatedGraphicsScene state updates

diff --git a/Source/WebKit/WebProcess/WebPage/AcceleratedDrawingArea.cpp b/Source/WebKit/WebProcess/WebPage/AcceleratedDrawingArea.cpp
@@ -474,6 +474,8 @@ void AcceleratedDrawingArea::attachViewOverlayGraphicsLayer(Frame* frame, Graphi
 
     if (m_layerTreeHost)
         m_layerTreeHost->setViewOverlayRootLayer(viewOverlayRootLayer);
+    else if (m_previousLayerTreeHost)
+        m_previousLayerTreeHost->setViewOverlayRootLayer(viewOverlayRootLayer);
 }
 
 } // namespace WebKit