Title: [175126] branches/safari-600.1.4.12-branch/Source/WebKit2
- Revision
- 175126
- Author
- [email protected]
- Date
- 2014-10-23 10:19:48 -0700 (Thu, 23 Oct 2014)
Log Message
Merge patch for r174799. <rdar://problem/18742380>
Modified Paths
Diff
Modified: branches/safari-600.1.4.12-branch/Source/WebKit2/ChangeLog (175125 => 175126)
--- branches/safari-600.1.4.12-branch/Source/WebKit2/ChangeLog 2014-10-23 16:34:27 UTC (rev 175125)
+++ branches/safari-600.1.4.12-branch/Source/WebKit2/ChangeLog 2014-10-23 17:19:48 UTC (rev 175126)
@@ -1,5 +1,9 @@
2014-10-23 Babak Shafiei <[email protected]>
+ Merge patch for r174799. <rdar://problem/18742380>
+
+2014-10-23 Babak Shafiei <[email protected]>
+
Merge r175081.
2014-10-22 Benjamin Poulain <[email protected]>
Modified: branches/safari-600.1.4.12-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm (175125 => 175126)
--- branches/safari-600.1.4.12-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2014-10-23 16:34:27 UTC (rev 175125)
+++ branches/safari-600.1.4.12-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2014-10-23 17:19:48 UTC (rev 175126)
@@ -54,6 +54,9 @@
RemoteLayerTreeHost::~RemoteLayerTreeHost()
{
+ for (auto& delegate : m_animationDelegates.values())
+ [delegate.get() invalidate];
+
clearLayers();
}
Modified: branches/safari-600.1.4.12-branch/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm (175125 => 175126)
--- branches/safari-600.1.4.12-branch/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm 2014-10-23 16:34:27 UTC (rev 175125)
+++ branches/safari-600.1.4.12-branch/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm 2014-10-23 17:19:48 UTC (rev 175126)
@@ -54,6 +54,7 @@
}
- (instancetype)initWithLayerID:(GraphicsLayer::PlatformLayerID)layerID layerTreeHost:(WebKit::RemoteLayerTreeHost*)layerTreeHost;
+- (void)invalidate;
@end
@implementation WKAnimationDelegate
@@ -67,8 +68,16 @@
return self;
}
+- (void)invalidate
+{
+ _layerTreeHost = nullptr;
+}
+
- (void)animationDidStart:(CAAnimation *)animation
{
+ if (!_layerTreeHost)
+ return;
+
bool hasExplicitBeginTime = [[animation valueForKey:WKExplicitBeginTimeFlag] boolValue];
CFTimeInterval startTime;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
