Title: [154180] trunk
- Revision
- 154180
- Author
- [email protected]
- Date
- 2013-08-16 08:27:35 -0700 (Fri, 16 Aug 2013)
Log Message
Source/WebCore: [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
LayoutTests: [Windows] Enable previously-failing compositing/tiling/empty-to-tiled.html
https://bugs.webkit.org/show_bug.cgi?id=119818
Reviewed by Darin Adler.
* platform/win/TestExpectations: Re-enable empty-to-tiled.html
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (154179 => 154180)
--- trunk/LayoutTests/ChangeLog 2013-08-16 14:52:47 UTC (rev 154179)
+++ trunk/LayoutTests/ChangeLog 2013-08-16 15:27:35 UTC (rev 154180)
@@ -1,3 +1,12 @@
+2013-08-16 Brent Fulgham <[email protected]>
+
+ [Windows] Enable previously-failing compositing/tiling/empty-to-tiled.html
+ https://bugs.webkit.org/show_bug.cgi?id=119818
+
+ Reviewed by Darin Adler.
+
+ * platform/win/TestExpectations: Re-enable empty-to-tiled.html
+
2013-08-16 Tamas Czene <[email protected]>
[Qt] Unreviewed gardening. Rebase js tests after r154127.
Modified: trunk/LayoutTests/platform/win/TestExpectations (154179 => 154180)
--- trunk/LayoutTests/platform/win/TestExpectations 2013-08-16 14:52:47 UTC (rev 154179)
+++ trunk/LayoutTests/platform/win/TestExpectations 2013-08-16 15:27:35 UTC (rev 154180)
@@ -2813,5 +2813,3 @@
fast/js/global-constructors-attributes-dedicated-worker.html [ Failure ]
fast/text/split-text-crash.xhtml [ Failure ]
fast/frames/seamless/seamless-nested-crash.html [ Failure ]
-
-webkit.org/b/119818 compositing/tiling/empty-to-tiled.html [ Crash ]
Modified: trunk/Source/WebCore/ChangeLog (154179 => 154180)
--- trunk/Source/WebCore/ChangeLog 2013-08-16 14:52:47 UTC (rev 154179)
+++ trunk/Source/WebCore/ChangeLog 2013-08-16 15:27:35 UTC (rev 154180)
@@ -1,3 +1,16 @@
+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-08-16 Andreas Kling <[email protected]>
<https://webkit.org/b/119866> Frame::eventHandler() should return a reference.
Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp (154179 => 154180)
--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2013-08-16 14:52:47 UTC (rev 154179)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2013-08-16 15:27:35 UTC (rev 154180)
@@ -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
