Title: [220844] releases/WebKitGTK/webkit-2.18/Source/WebKit
- Revision
- 220844
- Author
- [email protected]
- Date
- 2017-08-17 00:50:01 -0700 (Thu, 17 Aug 2017)
Log Message
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):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog (220843 => 220844)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog 2017-08-17 07:49:21 UTC (rev 220843)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog 2017-08-17 07:50:01 UTC (rev 220844)
@@ -1,3 +1,17 @@
+2017-08-16 Miguel Gomez <[email protected]>
+
+ [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 <[email protected]>
[CoordGraphics] Simplify CoordinatedGraphicsScene state updates
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/WebProcess/WebPage/AcceleratedDrawingArea.cpp (220843 => 220844)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/WebProcess/WebPage/AcceleratedDrawingArea.cpp 2017-08-17 07:49:21 UTC (rev 220843)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/WebProcess/WebPage/AcceleratedDrawingArea.cpp 2017-08-17 07:50:01 UTC (rev 220844)
@@ -474,6 +474,8 @@
if (m_layerTreeHost)
m_layerTreeHost->setViewOverlayRootLayer(viewOverlayRootLayer);
+ else if (m_previousLayerTreeHost)
+ m_previousLayerTreeHost->setViewOverlayRootLayer(viewOverlayRootLayer);
}
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
