Title: [213800] releases/WebKitGTK/webkit-2.16/Source/WebCore
- Revision
- 213800
- Author
- [email protected]
- Date
- 2017-03-13 02:55:26 -0700 (Mon, 13 Mar 2017)
Log Message
Merge r213276 - [GTK] Crash in WebCore::CoordinatedGraphicsLayer::notifyFlushRequired
https://bugs.webkit.org/show_bug.cgi?id=166420
Reviewed by Žan Doberšek.
This is happening when closing a page that is being inspected. When CoordinatedGraphicsLayer::removeFromParent()
is called, the coordinator has already been invalidated, so all its layers were set a nullptr coordinator. I
think it's safe to simply handle m_coordinator being nullptr in notifyFlushRequired().
* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
(WebCore::CoordinatedGraphicsLayer::notifyFlushRequired): Return early if the coordinator is nullptr.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (213799 => 213800)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-03-13 09:54:47 UTC (rev 213799)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-03-13 09:55:26 UTC (rev 213800)
@@ -1,3 +1,17 @@
+2017-03-02 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Crash in WebCore::CoordinatedGraphicsLayer::notifyFlushRequired
+ https://bugs.webkit.org/show_bug.cgi?id=166420
+
+ Reviewed by Žan Doberšek.
+
+ This is happening when closing a page that is being inspected. When CoordinatedGraphicsLayer::removeFromParent()
+ is called, the coordinator has already been invalidated, so all its layers were set a nullptr coordinator. I
+ think it's safe to simply handle m_coordinator being nullptr in notifyFlushRequired().
+
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+ (WebCore::CoordinatedGraphicsLayer::notifyFlushRequired): Return early if the coordinator is nullptr.
+
2017-03-01 Carlos Garcia Campos <[email protected]>
[GTK] fast/canvas/canvas-createPattern-video-loading.html makes its subsequent test timeout
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (213799 => 213800)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2017-03-13 09:54:47 UTC (rev 213799)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2017-03-13 09:55:26 UTC (rev 213800)
@@ -53,7 +53,9 @@
void CoordinatedGraphicsLayer::notifyFlushRequired()
{
- ASSERT(m_coordinator);
+ if (!m_coordinator)
+ return;
+
if (m_coordinator->isFlushingLayerChanges())
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
