Title: [199429] releases/WebKitGTK/webkit-2.12/Source/WebCore
- Revision
- 199429
- Author
- [email protected]
- Date
- 2016-04-13 01:38:35 -0700 (Wed, 13 Apr 2016)
Log Message
Merge r198521 - [TextureMapper] Destructing TextureMapperLayer should clean up its effect target
https://bugs.webkit.org/show_bug.cgi?id=155718
Reviewed by Darin Adler.
TextureMapperLayer destructor should, in case of non-null effect target,
null out the effect target's mask and replica layer pointers if those
pointers point to the TextureMapperLayer object that's being destroyed,
avoiding use-after-free occurrences.
* platform/graphics/texmap/TextureMapperLayer.cpp:
(WebCore::TextureMapperLayer::~TextureMapperLayer):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (199428 => 199429)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-13 08:37:54 UTC (rev 199428)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-13 08:38:35 UTC (rev 199429)
@@ -1,3 +1,18 @@
+2016-03-22 Zan Dobersek <[email protected]>
+
+ [TextureMapper] Destructing TextureMapperLayer should clean up its effect target
+ https://bugs.webkit.org/show_bug.cgi?id=155718
+
+ Reviewed by Darin Adler.
+
+ TextureMapperLayer destructor should, in case of non-null effect target,
+ null out the effect target's mask and replica layer pointers if those
+ pointers point to the TextureMapperLayer object that's being destroyed,
+ avoiding use-after-free occurrences.
+
+ * platform/graphics/texmap/TextureMapperLayer.cpp:
+ (WebCore::TextureMapperLayer::~TextureMapperLayer):
+
2016-03-21 Zalan Bujtas <[email protected]>
WebCore::RenderTableCell::setCol should put a cap on the column value.
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp (199428 => 199429)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp 2016-04-13 08:37:54 UTC (rev 199428)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp 2016-04-13 08:38:35 UTC (rev 199429)
@@ -444,6 +444,13 @@
child->m_parent = nullptr;
removeFromParent();
+
+ if (m_effectTarget) {
+ if (m_effectTarget->m_state.maskLayer == this)
+ m_effectTarget->m_state.maskLayer = nullptr;
+ if (m_effectTarget->m_state.replicaLayer == this)
+ m_effectTarget->m_state.replicaLayer = nullptr;
+ }
}
#if !USE(COORDINATED_GRAPHICS)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
