Title: [88863] branches/safari-534-branch/Source
Diff
Modified: branches/safari-534-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm (88862 => 88863)
--- branches/safari-534-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm 2011-06-14 23:02:11 UTC (rev 88862)
+++ branches/safari-534-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm 2011-06-14 23:03:47 UTC (rev 88863)
@@ -393,8 +393,11 @@
void MediaPlayerPrivateAVFoundationObjC::platformSetVisible(bool isVisible)
{
+ [CATransaction begin];
+ [CATransaction setDisableActions:YES];
if (m_videoLayer)
[m_videoLayer.get() setHidden:!isVisible];
+ [CATransaction commit];
}
void MediaPlayerPrivateAVFoundationObjC::platformPlay()
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (88862 => 88863)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-14 23:02:11 UTC (rev 88862)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-14 23:03:47 UTC (rev 88863)
@@ -1,5 +1,27 @@
2011-06-14 Lucas Forschler <[email protected]>
+ Merged 88599.
+
+ 2011-06-09 Jer Noble <[email protected]>
+
+ Reviewed by Darin Adler.
+
+ AVPlayerLayer is adding a "fade" animation during Safari full-screen
+ https://bugs.webkit.org/show_bug.cgi?id=62433
+
+ CoreAnimation will add default animations when certain properties are changed, unless
+ those changes are wrapped in a CATransaction which has had its disableActions property set
+ to true. Wrap each of these three property changes in a CATransaction and disable its actions,
+ so that the default "fade" animation is not created in response.
+
+ * UIProcess/mac/WKFullScreenWindowController.mm:
+ (-[WKFullScreenWindowController enterFullScreen:]): Wrap with CATransaction.
+ (-[WKFullScreenWindowController _swapView:with:]): Ditto:
+ * WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm:
+ (WebKit::WebFullScreenManagerMac::setRootFullScreenLayer): Ditto.
+
+2011-06-14 Lucas Forschler <[email protected]>
+
Merged 88588.
2011-06-10 Anders Carlsson <[email protected]>
Modified: branches/safari-534-branch/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm (88862 => 88863)
--- branches/safari-534-branch/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2011-06-14 23:02:11 UTC (rev 88862)
+++ branches/safari-534-branch/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2011-06-14 23:03:47 UTC (rev 88863)
@@ -194,14 +194,15 @@
// monitors, we must create a window large enough to contain the destination
// frame and the initial frame.
NSRect windowFrame = NSUnionRect(screenFrame, webViewFrame);
+
+ [CATransaction begin];
+ [CATransaction setDisableActions:YES];
[[self window] setFrame:windowFrame display:YES];
CALayer* backgroundLayer = [[self _fullScreenWindow] backgroundLayer];
NSRect backgroundFrame = {[[self window] convertScreenToBase:screenFrame.origin], screenFrame.size};
backgroundFrame = [[[self window] contentView] convertRectFromBase:backgroundFrame];
- [CATransaction begin];
- [CATransaction setDisableActions:YES];
[backgroundLayer setFrame:NSRectToCGRect(backgroundFrame)];
[CATransaction commit];
@@ -567,10 +568,13 @@
- (void)_swapView:(NSView*)view with:(NSView*)otherView
{
+ [CATransaction begin];
+ [CATransaction setDisableActions:YES];
[otherView setFrame:[view frame]];
[otherView setAutoresizingMask:[view autoresizingMask]];
[otherView removeFromSuperview];
[[view superview] replaceSubview:view with:otherView];
+ [CATransaction commit];
}
#pragma mark -
Modified: branches/safari-534-branch/Source/WebKit2/WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm (88862 => 88863)
--- branches/safari-534-branch/Source/WebKit2/WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm 2011-06-14 23:02:11 UTC (rev 88862)
+++ branches/safari-534-branch/Source/WebKit2/WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm 2011-06-14 23:03:47 UTC (rev 88863)
@@ -186,9 +186,12 @@
m_page->send(Messages::WebFullScreenManagerProxy::EnterAcceleratedCompositingMode(m_layerTreeContext));
}
+ [CATransaction begin];
+ [CATransaction setDisableActions:YES];
m_rootLayer->removeAllChildren();
m_rootLayer->addChild(layer);
m_rootLayer->syncCompositingState();
+ [CATransaction commit];
[[NSNotificationCenter defaultCenter] postNotificationName:@"WebKitLayerHostChanged" object:m_rootLayer->platformLayer() userInfo:nil];
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
