Title: [202629] trunk/Source
- Revision
- 202629
- Author
- commit-qu...@webkit.org
- Date
- 2016-06-29 10:42:01 -0700 (Wed, 29 Jun 2016)
Log Message
Replace MPAudioVideoRoutingActionSheet with MPAVRoutingSheet.
https://bugs.webkit.org/show_bug.cgi?id=159161
<rdar://problem/26017691>
Patch by Jeremy Jones <jere...@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:]):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (202628 => 202629)
--- trunk/Source/WebCore/ChangeLog 2016-06-29 17:36:33 UTC (rev 202628)
+++ trunk/Source/WebCore/ChangeLog 2016-06-29 17:42:01 UTC (rev 202629)
@@ -1,3 +1,15 @@
+2016-06-29 Jeremy Jones <jere...@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 <a...@igalia.com>
WebRTC: ice-char can not contain '=' characters for credentials
Modified: trunk/Source/WebCore/platform/spi/ios/MediaPlayerSPI.h (202628 => 202629)
--- trunk/Source/WebCore/platform/spi/ios/MediaPlayerSPI.h 2016-06-29 17:36:33 UTC (rev 202628)
+++ trunk/Source/WebCore/platform/spi/ios/MediaPlayerSPI.h 2016-06-29 17:42:01 UTC (rev 202629)
@@ -33,7 +33,7 @@
#if USE(APPLE_INTERNAL_SDK)
#import <MediaPlayer/MPAVRoutingController.h>
-#import <MediaPlayer/MPAudioVideoRoutingActionSheet.h>
+#import <MediaPlayer/MPAVRoutingSheet.h>
#import <MediaPlayer/MPAudioVideoRoutingPopoverController.h>
#else
@@ -72,13 +72,20 @@
#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
#endif
Modified: trunk/Source/WebKit2/ChangeLog (202628 => 202629)
--- trunk/Source/WebKit2/ChangeLog 2016-06-29 17:36:33 UTC (rev 202628)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-29 17:42:01 UTC (rev 202629)
@@ -1,3 +1,18 @@
+2016-06-29 Jeremy Jones <jere...@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 <cgar...@igalia.com>
Too much duplicated code in LayerTreeHosts implementations
Modified: trunk/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm (202628 => 202629)
--- trunk/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm 2016-06-29 17:36:33 UTC (rev 202628)
+++ trunk/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm 2016-06-29 17:42:01 UTC (rev 202629)
@@ -42,7 +42,7 @@
SOFT_LINK_FRAMEWORK(MediaPlayer)
SOFT_LINK_CLASS(MediaPlayer, MPAVRoutingController)
SOFT_LINK_CLASS(MediaPlayer, MPAudioVideoRoutingPopoverController)
-SOFT_LINK_CLASS(MediaPlayer, MPAudioVideoRoutingActionSheet)
+SOFT_LINK_CLASS(MediaPlayer, MPAVRoutingSheet)
using namespace WebKit;
@@ -49,7 +49,7 @@
@implementation WKAirPlayRoutePicker {
RetainPtr<MPAVRoutingController> _routingController;
RetainPtr<MPAudioVideoRoutingPopoverController> _popoverController; // iPad
- RetainPtr<MPAudioVideoRoutingActionSheet> _actionSheet; // iPhone
+ RetainPtr<MPAVRoutingSheet> _actionSheet; // iPhone
WKContentView* _view; // Weak reference.
}
@@ -65,7 +65,7 @@
- (void)dealloc
{
// The ActionSheet's completion handler will release and clear the ActionSheet.
- [_actionSheet dismissWithClickedButtonIndex:[_actionSheet cancelButtonIndex] animated:YES];
+ [_actionSheet dismiss];
[self _dismissAirPlayRoutePickerIPad];
[super dealloc];
@@ -134,18 +134,13 @@
if (_actionSheet)
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;
+ }];
}
- (void)show:(BOOL)hasVideo fromRect:(CGRect)elementRect
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
