Title: [159124] trunk/Source/WebKit2
- Revision
- 159124
- Author
- [email protected]
- Date
- 2013-11-12 10:55:22 -0800 (Tue, 12 Nov 2013)
Log Message
Remote Layer Tree: Assertions during layer flushing after replaceSublayer()
https://bugs.webkit.org/show_bug.cgi?id=124194
Reviewed by Anders Carlsson.
* WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
(PlatformCALayerRemote::replaceSublayer):
Only remove the old layer from the children array once (via removeFromSuperlayer).
Update the superlayer backpointer on the new layer.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (159123 => 159124)
--- trunk/Source/WebKit2/ChangeLog 2013-11-12 18:32:53 UTC (rev 159123)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-12 18:55:22 UTC (rev 159124)
@@ -1,3 +1,15 @@
+2013-11-12 Tim Horton <[email protected]>
+
+ Remote Layer Tree: Assertions during layer flushing after replaceSublayer()
+ https://bugs.webkit.org/show_bug.cgi?id=124194
+
+ Reviewed by Anders Carlsson.
+
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
+ (PlatformCALayerRemote::replaceSublayer):
+ Only remove the old layer from the children array once (via removeFromSuperlayer).
+ Update the superlayer backpointer on the new layer.
+
2013-11-12 Anders Carlsson <[email protected]>
Add ImmutableArray::createStringArray
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp (159123 => 159124)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2013-11-12 18:32:53 UTC (rev 159123)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2013-11-12 18:55:22 UTC (rev 159124)
@@ -233,8 +233,8 @@
size_t referenceIndex = m_children.find(reference);
if (referenceIndex != notFound) {
m_children[referenceIndex]->removeFromSuperlayer();
- m_children.remove(referenceIndex);
m_children.insert(referenceIndex, layer);
+ toPlatformCALayerRemote(layer)->m_superlayer = this;
}
m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::ChildrenChanged);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
