Title: [189298] branches/safari-601.1.46-branch/Source/WebKit2
- Revision
- 189298
- Author
- [email protected]
- Date
- 2015-09-03 15:32:17 -0700 (Thu, 03 Sep 2015)
Log Message
Merged r188991. rdar://problem/22462872
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (189297 => 189298)
--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-09-03 22:30:37 UTC (rev 189297)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-09-03 22:32:17 UTC (rev 189298)
@@ -1,3 +1,22 @@
+2015-09-03 Babak Shafiei <[email protected]>
+
+ Merge r188991.
+
+ 2015-08-26 Wenson Hsieh <[email protected]>
+
+ Fix crash due to animationDidEnd called on deallocated RemoteLayerTreeHost
+ https://bugs.webkit.org/show_bug.cgi?id=148442
+ <rdar://problem/21609257>
+
+ Reviewed by Tim Horton.
+
+ A PlatformCAAnimationRemote's backpointer to a deallocated RemoteLayerTreeHost is not
+ invalidated when its host removes its reference to it.
+
+ * UIProcess/mac/RemoteLayerTreeHost.mm:
+ (WebKit::RemoteLayerTreeHost::layerWillBeRemoved): Invalidate a backpointer from the
+ PlatformCAAnimationRemotes to the RemoteLayerTreeHost.
+
2015-08-26 Babak Shafiei <[email protected]>
Merge r188933.
Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm (189297 => 189298)
--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2015-09-03 22:30:37 UTC (rev 189297)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2015-09-03 22:32:17 UTC (rev 189298)
@@ -138,7 +138,11 @@
void RemoteLayerTreeHost::layerWillBeRemoved(WebCore::GraphicsLayer::PlatformLayerID layerID)
{
- m_animationDelegates.remove(layerID);
+ auto iter = m_animationDelegates.find(layerID);
+ if (iter != m_animationDelegates.end()) {
+ [iter->value invalidate];
+ m_animationDelegates.remove(iter);
+ }
m_layers.remove(layerID);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
