Changeset 259561 in webkit

Timestamp:

Apr 5, 2020, 9:02:43 PM (6 years ago)

Author:

Peng Liu

Message:

The value of [AVPlayerViewController isPictureInPicturePossible] is NO in the first attempt to enter PiP
​https://bugs.webkit.org/show_bug.cgi?id=204979

Reviewed by Darin Adler.

We should use "#if HAVE(AVOBSERVATIONCONTROLLER)" instead of
"#if HAVE(HAVE_AVOBSERVATIONCONTROLLER)".

Source/WebCore:

• platform/ios/VideoFullscreenInterfaceAVKit.mm:

(-[WebAVPlayerViewController initWithFullscreenInterface:]):
(VideoFullscreenInterfaceAVKit::doEnterFullscreen):

Source/WebCore/PAL:

• pal/spi/cocoa/AVKitSPI.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• PAL/ChangeLog (modified) (1 diff)
• PAL/pal/spi/cocoa/AVKitSPI.h (modified) (2 diffs)
• platform/ios/VideoFullscreenInterfaceAVKit.mm (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-05  Peng Liu  <peng.liu6@apple.com>
+
+        The value of [AVPlayerViewController isPictureInPicturePossible] is NO in the first attempt to enter PiP
+        https://bugs.webkit.org/show_bug.cgi?id=204979
+
+        Reviewed by Darin Adler.
+
+        We should use "#if HAVE(AVOBSERVATIONCONTROLLER)" instead of
+        "#if HAVE(HAVE_AVOBSERVATIONCONTROLLER)".
+
+        * platform/ios/VideoFullscreenInterfaceAVKit.mm:
+        (-[WebAVPlayerViewController initWithFullscreenInterface:]):
+        (VideoFullscreenInterfaceAVKit::doEnterFullscreen):
+
 2020-04-05  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2020-04-05  Peng Liu  <peng.liu6@apple.com>
+
+        The value of [AVPlayerViewController isPictureInPicturePossible] is NO in the first attempt to enter PiP
+        https://bugs.webkit.org/show_bug.cgi?id=204979
+
+        Reviewed by Darin Adler.
+
+        We should use "#if HAVE(AVOBSERVATIONCONTROLLER)" instead of
+        "#if HAVE(HAVE_AVOBSERVATIONCONTROLLER)".
+
+        * pal/spi/cocoa/AVKitSPI.h:
+
 2020-04-03  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/cocoa/AVKitSPI.h

@@ -55 +55 @@
 #endif // USE(APPLE_INTERNAL_SDK)
 
-#if HAVE(HAVE_AVOBSERVATIONCONTROLLER)
+#if HAVE(AVOBSERVATIONCONTROLLER)
 #if USE(APPLE_INTERNAL_SDK)
 #import <AVKit/AVObservationController.h>
 #else
+
 @class AVKeyValueChange;
+
+NS_ASSUME_NONNULL_BEGIN
 
 @interface AVObservationController<Owner> : NSObject
@@ -66 +69 @@
 - (void)stopAllObservation;
 @end
-#endif
-#endif // HAVE(HAVE_AVOBSERVATIONCONTROLLER)
+
+NS_ASSUME_NONNULL_END
+
+#endif
+#endif // HAVE(AVOBSERVATIONCONTROLLER)
 
 #if PLATFORM(IOS_FAMILY)

trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm

@@ -60 +60 @@
 
 SOFTLINK_AVKIT_FRAMEWORK()
-#if HAVE(HAVE_AVOBSERVATIONCONTROLLER)
+#if HAVE(AVOBSERVATIONCONTROLLER)
 SOFT_LINK_CLASS_OPTIONAL(AVKit, AVObservationController)
 #endif
@@ -546 +546 @@
     RetainPtr<UIViewController> _presentingViewController;
     RetainPtr<AVPlayerViewController> _avPlayerViewController;
-#if HAVE(HAVE_AVOBSERVATIONCONTROLLER)
+#if HAVE(AVOBSERVATIONCONTROLLER)
     RetainPtr<NSTimer> _startPictureInPictureTimer;
     RetainPtr<AVObservationController> _avPlayerViewControllerObservationController;
@@ -561 +561 @@
     _avPlayerViewController = adoptNS([allocAVPlayerViewControllerInstance() initWithPlayerLayerView:interface->playerLayerView()]);
     _avPlayerViewController.get().modalPresentationStyle = UIModalPresentationOverFullScreen;
-#if HAVE(HAVE_AVOBSERVATIONCONTROLLER)
+#if HAVE(AVOBSERVATIONCONTROLLER)
     _avPlayerViewControllerObservationController = adoptNS([allocAVObservationControllerInstance() initWithOwner:_avPlayerViewController.get()]);
 #endif
@@ -571 +571 @@
 }
 
-#if HAVE(HAVE_AVOBSERVATIONCONTROLLER)
+#if HAVE(AVOBSERVATIONCONTROLLER)
 - (void)dealloc
 {
@@ -637 +637 @@
 #endif
 
-#if HAVE(HAVE_AVOBSERVATIONCONTROLLER)
+#if HAVE(AVOBSERVATIONCONTROLLER)
 static const NSTimeInterval startPictureInPictureTimeInterval = 0.5;
 
@@ -1387 +1387 @@
             [m_playerViewController startPictureInPicture];
         else
-#if HAVE(HAVE_AVOBSERVATIONCONTROLLER)
+#if HAVE(AVOBSERVATIONCONTROLLER)
             [m_playerViewController tryToStartPictureInPicture];
 #else