Title: [183690] trunk/Source/WebCore
Revision
183690
Author
[email protected]
Date
2015-05-01 14:18:05 -0700 (Fri, 01 May 2015)

Log Message

Stop using deprecated AVKit SPI for enter and exit fullscreen.
https://bugs.webkit.org/show_bug.cgi?id=144493

Patch by Jeremy Jones <[email protected]> on 2015-05-01
Reviewed by Jer Noble.

Replace
    -enterFullScreenWithCompletionHandler:
    -exitFullScreenWithCompletionHandler:
with
    -enterFullScreenAnimated:completionHandler:
    -exitFullScreenAnimated:completionHandler:

* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
(WebVideoFullscreenInterfaceAVKit::enterFullscreenStandard):
(WebVideoFullscreenInterfaceAVKit::exitFullscreenInternal):
* platform/spi/cocoa/AVKitSPI.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (183689 => 183690)


--- trunk/Source/WebCore/ChangeLog	2015-05-01 21:07:09 UTC (rev 183689)
+++ trunk/Source/WebCore/ChangeLog	2015-05-01 21:18:05 UTC (rev 183690)
@@ -1,3 +1,22 @@
+2015-05-01  Jeremy Jones  <[email protected]>
+
+        Stop using deprecated AVKit SPI for enter and exit fullscreen.
+        https://bugs.webkit.org/show_bug.cgi?id=144493
+
+        Reviewed by Jer Noble.
+
+        Replace 
+            -enterFullScreenWithCompletionHandler:
+            -exitFullScreenWithCompletionHandler:
+        with
+            -enterFullScreenAnimated:completionHandler:
+            -exitFullScreenAnimated:completionHandler:
+        
+        * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+        (WebVideoFullscreenInterfaceAVKit::enterFullscreenStandard):
+        (WebVideoFullscreenInterfaceAVKit::exitFullscreenInternal):
+        * platform/spi/cocoa/AVKitSPI.h:
+
 2015-05-01  Roger Fong  <[email protected]>
 
         Media control volume slider is opaque.

Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (183689 => 183690)


--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm	2015-05-01 21:07:09 UTC (rev 183689)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm	2015-05-01 21:18:05 UTC (rev 183690)
@@ -1040,7 +1040,7 @@
 {
     LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::enterFullscreenStandard(%p)", this);
     RefPtr<WebVideoFullscreenInterfaceAVKit> strongThis(this);
-    [m_playerViewController enterFullScreenWithCompletionHandler:[this, strongThis] (BOOL succeeded, NSError*) {
+    [m_playerViewController enterFullScreenAnimated:YES completionHandler:[this, strongThis] (BOOL succeeded, NSError*) {
         UNUSED_PARAM(succeeded);
         LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::enterFullscreenStandard - lambda(%p) - succeeded(%s)", this, boolString(succeeded));
         [m_playerViewController setShowsPlaybackControls:YES];
@@ -1095,7 +1095,7 @@
         }];
     } else if (isMode(HTMLMediaElement::VideoFullscreenModeStandard)) {
         RefPtr<WebVideoFullscreenInterfaceAVKit> strongThis(this);
-        [m_playerViewController exitFullScreenWithCompletionHandler:[strongThis] (BOOL, NSError*) {
+        [m_playerViewController exitFullScreenAnimated:YES completionHandler:[strongThis] (BOOL, NSError*) {
             strongThis->m_exitCompleted = true;
 
             [CATransaction begin];

Modified: trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h (183689 => 183690)


--- trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h	2015-05-01 21:07:09 UTC (rev 183689)
+++ trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h	2015-05-01 21:18:05 UTC (rev 183690)
@@ -85,9 +85,8 @@
 
 @interface AVPlayerViewController (Details)
 - (instancetype)initWithVideoLayer:(CALayer <AVVideoLayer> *)videoLayer;
-- (void)enterFullScreenWithCompletionHandler:(void (^)(BOOL success, NSError *))completionHandler;
+- (void)enterFullScreenAnimated:(BOOL)animated completionHandler:(void (^)(BOOL success, NSError *))completionHandler;
 - (void)exitFullScreenAnimated:(BOOL)animated completionHandler:(void (^)(BOOL success, NSError *))completionHandler;
-- (void)exitFullScreenWithCompletionHandler:(void (^)(BOOL success, NSError *))completionHandler;
 
 - (void)startOptimizedFullscreen;
 - (void)startOptimizedFullscreenWithStartCompletionHandler:(void (^)(BOOL success, NSError*))startCompletionHandler stopCompletionHandler:(void (^)(AVPlayerViewControllerOptimizedFullscreenStopReason))stopCompletionHandler;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to