Title: [158297] trunk/Source/WebKit2
- Revision
- 158297
- Author
- timothy_hor...@apple.com
- Date
- 2013-10-30 11:59:10 -0700 (Wed, 30 Oct 2013)
Log Message
Remote Layer Tree: Lots of ASSERT(m_children.isEmpty()); on Poster Circle
https://bugs.webkit.org/show_bug.cgi?id=123517
Reviewed by Simon Fraser.
* WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
(PlatformCALayerRemote::setSublayers):
When setting our list of sublayers, remove all of the new layers from
their parents first.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (158296 => 158297)
--- trunk/Source/WebKit2/ChangeLog 2013-10-30 18:56:26 UTC (rev 158296)
+++ trunk/Source/WebKit2/ChangeLog 2013-10-30 18:59:10 UTC (rev 158297)
@@ -1,3 +1,15 @@
+2013-10-30 Tim Horton <timothy_hor...@apple.com>
+
+ Remote Layer Tree: Lots of ASSERT(m_children.isEmpty()); on Poster Circle
+ https://bugs.webkit.org/show_bug.cgi?id=123517
+
+ Reviewed by Simon Fraser.
+
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
+ (PlatformCALayerRemote::setSublayers):
+ When setting our list of sublayers, remove all of the new layers from
+ their parents first.
+
2013-10-30 Antti Koivisto <an...@apple.com>
Add debug settings for simple line layout
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp (158296 => 158297)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2013-10-30 18:56:26 UTC (rev 158296)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2013-10-30 18:59:10 UTC (rev 158297)
@@ -167,8 +167,10 @@
removeAllSublayers();
m_children = list;
- for (const auto& layer : list)
+ for (const auto& layer : list) {
+ layer->removeFromSuperlayer();
toPlatformCALayerRemote(layer.get())->m_superlayer = this;
+ }
m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::ChildrenChanged);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
