Title: [118433] branches/safari-536-branch/Source/WebKit2
- Revision
- 118433
- Author
- [email protected]
- Date
- 2012-05-24 15:28:15 -0700 (Thu, 24 May 2012)
Log Message
Merged r118245 -> <rdar://problem/11506223>
Modified Paths
Diff
Modified: branches/safari-536-branch/Source/WebKit2/ChangeLog (118432 => 118433)
--- branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-05-24 22:26:46 UTC (rev 118432)
+++ branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-05-24 22:28:15 UTC (rev 118433)
@@ -1,5 +1,22 @@
2012-05-24 Lucas Forschler <[email protected]>
+ Merge 118245
+
+ 2012-05-23 Jer Noble <[email protected]>
+
+ REGRESSION (117623) - Entering/exiting fullscreen HTML5 videos, there is a quick animated fade
+ https://bugs.webkit.org/show_bug.cgi?id=87294
+
+ Reviewed by Darin Adler.
+
+ When setting the sublayers array on the layer hosting view, wrap the call in a CATransaction which disables
+ animations.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _updateAcceleratedCompositingMode:WebKit::]):
+
+2012-05-24 Lucas Forschler <[email protected]>
+
Merge 118211
2012-05-23 Jer Noble <[email protected]>
Modified: branches/safari-536-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (118432 => 118433)
--- branches/safari-536-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-05-24 22:26:46 UTC (rev 118432)
+++ branches/safari-536-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-05-24 22:28:15 UTC (rev 118433)
@@ -2512,8 +2512,15 @@
- (void)_updateAcceleratedCompositingMode:(const WebKit::LayerTreeContext&)layerTreeContext
{
if (_data->_layerHostingView) {
+ // Wrap the call to setSublayers: in a CATransaction with actions disabled to
+ // keep CA from cross-fading between the two sublayer arrays.
+ [CATransaction begin];
+ [CATransaction setDisableActions:YES];
+
CALayer *renderLayer = WKMakeRenderLayer(layerTreeContext.contextID);
[[_data->_layerHostingView.get() layer] setSublayers:[NSArray arrayWithObject:renderLayer]];
+
+ [CATransaction commit];
} else {
[self _exitAcceleratedCompositingMode];
[self _enterAcceleratedCompositingMode:layerTreeContext];
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
