Changeset 172244 in webkit

Timestamp:

Aug 7, 2014, 1:41:23 PM (11 years ago)

Author:

jeremyj-wk@apple.com

Message:

Disable implicit animations on video layer.
​https://bugs.webkit.org/show_bug.cgi?id=135679

Reviewed by Eric Carlson.

Disable implicit animations on AVPlayerLayer except when setting fullscreen frame.
This prevents unwanted animations.

• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:

(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerLayer): disable implicit animations
(WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenFrame): allow implicit animations while changing fullscreen frame.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-08-06  Jeremy Jones  <jeremyj@apple.com>
+
+        Disable implicit animations on video layer.
+        https://bugs.webkit.org/show_bug.cgi?id=135679
+
+        Reviewed by Eric Carlson.
+
+        Disable implicit animations on AVPlayerLayer except when setting fullscreen frame.
+        This prevents unwanted animations.
+
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerLayer): disable implicit animations
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenFrame): allow implicit animations while changing fullscreen frame.
+
 2014-08-07  Gordon Sheridan  <gordon_sheridan@apple.com>
 

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

@@ -55 +55 @@
 #import "VideoTrackPrivateAVFObjC.h"
 #import "WebCoreAVFResourceLoader.h"
+#import "WebCoreCALayerExtras.h"
 #import "WebCoreSystemInterface.h"
 #import <objc/runtime.h>
@@ -596 +597 @@
 
 #if PLATFORM(IOS)
+    [m_videoLayer web_disableAllActions];
     m_videoInlineLayer = adoptNS([[WebVideoContainerLayer alloc] init]);
     [m_videoInlineLayer setFrame:CGRectMake(0, 0, defaultSize.width(), defaultSize.height())];
@@ -1004 +1006 @@
 
     if (m_videoLayer) {
+        [m_videoLayer setStyle:nil]; // This enables actions, i.e. implicit animations.
         [CATransaction begin];
-        [CATransaction setDisableActions:YES];
         [m_videoLayer setFrame:CGRectMake(0, 0, frame.width(), frame.height())];
         [CATransaction commit];
+        [m_videoLayer web_disableAllActions];
     }
     syncTextTrackBounds();