Changeset 202629 in webkit

Timestamp:

Jun 29, 2016 10:42:01 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Replace MPAudioVideoRoutingActionSheet with MPAVRoutingSheet.
​https://bugs.webkit.org/show_bug.cgi?id=159161
<rdar://problem/26017691>

Patch by Jeremy Jones <​jeremyj@apple.com> on 2016-06-29
Reviewed by Sam Weinig.

Source/WebCore:

Replace MPAudioVideoRoutingActionSheet SPI with MPAVRoutingSheet SPI.

• platform/spi/ios/MediaPlayerSPI.h:

Source/WebKit2:

MPAudioVideoRoutingActionSheet is being replaced by MPAVRoutingSheet,
with only minor changes to the interface.

• UIProcess/ios/forms/WKAirPlayRoutePicker.mm:

(-[WKAirPlayRoutePicker dealloc]):
(-[WKAirPlayRoutePicker showAirPlayPickerIPhone:]):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/spi/ios/MediaPlayerSPI.h (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-29  Jeremy Jones  <jeremyj@apple.com>
+
+        Replace MPAudioVideoRoutingActionSheet with MPAVRoutingSheet.
+        https://bugs.webkit.org/show_bug.cgi?id=159161
+        <rdar://problem/26017691>
+
+        Reviewed by Sam Weinig.
+
+        Replace MPAudioVideoRoutingActionSheet SPI with MPAVRoutingSheet SPI.
+
+        * platform/spi/ios/MediaPlayerSPI.h:
+
 2016-06-29  Alejandro G. Castro  <alex@igalia.com>
 

trunk/Source/WebCore/platform/spi/ios/MediaPlayerSPI.h

@@ -34 +34 @@
 
 #import <MediaPlayer/MPAVRoutingController.h>
-#import <MediaPlayer/MPAudioVideoRoutingActionSheet.h>
+#import <MediaPlayer/MPAVRoutingSheet.h>
 #import <MediaPlayer/MPAudioVideoRoutingPopoverController.h>
 
@@ -73 +73 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-@interface MPAudioVideoRoutingActionSheet : UIActionSheet
+@interface MPAVRoutingSheet : UIView
 @end
 #pragma clang diagnostic pop
 
-@interface MPAudioVideoRoutingActionSheet ()
-- (id)initWithType:(MPAVItemType)avItemType;
-- (void)showWithValidInterfaceOrientationMaskBlock:(UIInterfaceOrientationMask (^)(void))block completionHandler:(void (^)())completionHandler;
+@interface MPAVRoutingSheet ()
+@property (nonatomic, assign, setter=setAVItemType:) MPAVItemType avItemType;
+
+@property (nonatomic, assign) BOOL mirroringOnly;
+
+- (id)initWithAVItemType:(MPAVItemType)avItemType;
+
+- (void)showInView:(UIView *)view withCompletionHandler:(void (^)(void))completionHandler;
+
+- (void)dismiss;
 @end
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-06-29  Jeremy Jones  <jeremyj@apple.com>
+
+        Replace MPAudioVideoRoutingActionSheet with MPAVRoutingSheet.
+        https://bugs.webkit.org/show_bug.cgi?id=159161
+        <rdar://problem/26017691>
+
+        Reviewed by Sam Weinig.
+
+        MPAudioVideoRoutingActionSheet is being replaced by MPAVRoutingSheet,
+        with only minor changes to the interface.
+
+        * UIProcess/ios/forms/WKAirPlayRoutePicker.mm:
+        (-[WKAirPlayRoutePicker dealloc]):
+        (-[WKAirPlayRoutePicker showAirPlayPickerIPhone:]):
+
 2016-06-29  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm

@@ -43 +43 @@
 SOFT_LINK_CLASS(MediaPlayer, MPAVRoutingController)
 SOFT_LINK_CLASS(MediaPlayer, MPAudioVideoRoutingPopoverController)
-SOFT_LINK_CLASS(MediaPlayer, MPAudioVideoRoutingActionSheet)
+SOFT_LINK_CLASS(MediaPlayer, MPAVRoutingSheet)
 
 using namespace WebKit;
@@ -50 +50 @@
     RetainPtr<MPAVRoutingController> _routingController;
     RetainPtr<MPAudioVideoRoutingPopoverController> _popoverController;  // iPad
-    RetainPtr<MPAudioVideoRoutingActionSheet> _actionSheet;              // iPhone
+    RetainPtr<MPAVRoutingSheet> _actionSheet; // iPhone
     WKContentView* _view; // Weak reference.
 }
@@ -66 +66 @@
 {
     // The ActionSheet's completion handler will release and clear the ActionSheet.
-    [_actionSheet dismissWithClickedButtonIndex:[_actionSheet cancelButtonIndex] animated:YES];
+    [_actionSheet dismiss];
     [self _dismissAirPlayRoutePickerIPad];
 
@@ -135 +135 @@
         return;
 
-    _actionSheet = adoptNS([allocMPAudioVideoRoutingActionSheetInstance() initWithType:itemType]);
+    _actionSheet = adoptNS([allocMPAVRoutingSheetInstance() initWithAVItemType:itemType]);
 
-    [_actionSheet
-        showWithValidInterfaceOrientationMaskBlock:^UIInterfaceOrientationMask {
-            return UIInterfaceOrientationMaskPortrait;
-        }
-        completionHandler:^{
-            [_routingController setDiscoveryMode:MPRouteDiscoveryModeDisabled];
-            _routingController = nil;
-            _actionSheet = nil;
-        }
-     ];
+    [_actionSheet showInView:_view withCompletionHandler:^{
+        [_routingController setDiscoveryMode:MPRouteDiscoveryModeDisabled];
+        _routingController = nil;
+        _actionSheet = nil;
+    }];
 }