Title: [158615] branches/safari-537.60-branch/Source/WebCore
- Revision
- 158615
- Author
- [email protected]
- Date
- 2013-11-04 16:46:04 -0800 (Mon, 04 Nov 2013)
Log Message
Merged r154180. <rdar://problem/15387843>
Modified Paths
Diff
Modified: branches/safari-537.60-branch/Source/WebCore/ChangeLog (158614 => 158615)
--- branches/safari-537.60-branch/Source/WebCore/ChangeLog 2013-11-05 00:41:19 UTC (rev 158614)
+++ branches/safari-537.60-branch/Source/WebCore/ChangeLog 2013-11-05 00:46:04 UTC (rev 158615)
@@ -1,5 +1,22 @@
2013-11-04 Lucas Forschler <[email protected]>
+ Merge r154180
+
+ 2013-08-15 Brent Fulgham <[email protected]>
+
+ [Windows] Prevent dangling CACFLayer when switching to/from Tiled backing.
+ https://bugs.webkit.org/show_bug.cgi?id=119818
+
+ Reviewed by Darin Adler.
+
+ Covered by existing: compositing/tiling/empty-to-tiled.html
+
+ * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+ (PlatformCALayer::~PlatformCALayer): Remove deleted layer from its
+ parent layer
+
+2013-11-04 Lucas Forschler <[email protected]>
+
Merge r157773
2013-10-21 Brent Fulgham <[email protected]>
Modified: branches/safari-537.60-branch/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp (158614 => 158615)
--- branches/safari-537.60-branch/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2013-11-05 00:41:19 UTC (rev 158614)
+++ branches/safari-537.60-branch/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2013-11-05 00:46:04 UTC (rev 158615)
@@ -138,6 +138,12 @@
PlatformCALayerWinInternal* layerIntern = intern(this);
CACFLayerSetUserData(m_layer.get(), 0);
+ // Clear the owner, which also clears it in the delegate to prevent attempts
+ // to use the GraphicsLayerCA after it has been destroyed.
+ setOwner(0);
+
+ CACFLayerRemoveFromSuperlayer(m_layer.get());
+
delete layerIntern;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
