Build fix.
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Nov 2014 06:59:12 +0000 (06:59 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Nov 2014 06:59:12 +0000 (06:59 +0000)
* UIProcess/ios/forms/WKAirPlayRoutePicker.mm:
(-[WKAirPlayRoutePicker showAirPlayPickerIPad:fromRect:]): Cast the return value of
[getMPAudioVideoRoutingPopoverControllerClass() alloc] to resolve ambiguity about which
-initWithType: we are calling.
(-[WKAirPlayRoutePicker showAirPlayPickerIPhone:]): Cast to resolve ambiguity.
(-[WKAirPlayRoutePicker show:fromRect:]): Cast for consistency.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@176441 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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

index 951a9e5..46bc810 100644 (file)
@@ -1,3 +1,14 @@
+2014-11-20  Dan Bernstein  <mitz@apple.com>
+
+        Build fix.
+
+        * UIProcess/ios/forms/WKAirPlayRoutePicker.mm:
+        (-[WKAirPlayRoutePicker showAirPlayPickerIPad:fromRect:]): Cast the return value of
+        [getMPAudioVideoRoutingPopoverControllerClass() alloc] to resolve ambiguity about which
+        -initWithType: we are calling.
+        (-[WKAirPlayRoutePicker showAirPlayPickerIPhone:]): Cast to resolve ambiguity.
+        (-[WKAirPlayRoutePicker show:fromRect:]): Cast for consistency.
+
 2014-11-20  Benjamin Poulain  <bpoulain@apple.com>
 
         Remove the remaining vestiges of minimal-ui
index 8e3374b..5dcbf28 100644 (file)
@@ -116,7 +116,7 @@ using namespace WebKit;
     if (_popoverController)
         return;
 
-    _popoverController = adoptNS([[getMPAudioVideoRoutingPopoverControllerClass() alloc] initWithType:itemType]);
+    _popoverController = adoptNS([(MPAudioVideoRoutingPopoverController *)[getMPAudioVideoRoutingPopoverControllerClass() alloc] initWithType:itemType]);
     [_popoverController setDelegate:self];
 
     NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
@@ -131,7 +131,7 @@ using namespace WebKit;
     if (_actionSheet)
         return;
 
-    _actionSheet = adoptNS([[getMPAudioVideoRoutingActionSheetClass() alloc] initWithType:itemType]);
+    _actionSheet = adoptNS([(MPAudioVideoRoutingActionSheet *)[getMPAudioVideoRoutingActionSheetClass() alloc] initWithType:itemType]);
 
     [_actionSheet
         showWithValidInterfaceOrientationMaskBlock:^UIInterfaceOrientationMask {
@@ -146,7 +146,7 @@ using namespace WebKit;
 
 - (void)show:(BOOL)hasVideo fromRect:(CGRect)elementRect
 {
-    _routingController = adoptNS([[getMPAVRoutingControllerClass() alloc] initWithName:@"WebKit2 - HTML media element showing AirPlay route picker"]);
+    _routingController = adoptNS([(MPAVRoutingController *)[getMPAVRoutingControllerClass() alloc] initWithName:@"WebKit2 - HTML media element showing AirPlay route picker"]);
     [_routingController setDiscoveryMode:MPRouteDiscoveryModeDetailed];
 
     MPAVItemType itemType = hasVideo ? MPAVItemTypeVideo : MPAVItemTypeAudio;