Changeset 176445 in webkit

Timestamp:

Nov 20, 2014, 11:23:12 PM (12 years ago)

Author:

bshafiei@apple.com

Message:

Merged r176441. rdar://problem/19054967

Location:

tags/Safari-601.1.10.1/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/forms/WKAirPlayRoutePicker.mm (modified) (3 diffs)

tags/Safari-601.1.10.1/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-20  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r176441.
+
+    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-19  Babak Shafiei  <bshafiei@apple.com>
 

tags/Safari-601.1.10.1/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm

@@ -117 +117 @@
         return;
 
-    _popoverController = adoptNS([[getMPAudioVideoRoutingPopoverControllerClass() alloc] initWithType:itemType]);
+    _popoverController = adoptNS([(MPAudioVideoRoutingPopoverController *)[getMPAudioVideoRoutingPopoverControllerClass() alloc] initWithType:itemType]);
     [_popoverController setDelegate:self];
 
@@ -132 +132 @@
         return;
 
-    _actionSheet = adoptNS([[getMPAudioVideoRoutingActionSheetClass() alloc] initWithType:itemType]);
+    _actionSheet = adoptNS([(MPAudioVideoRoutingActionSheet *)[getMPAudioVideoRoutingActionSheetClass() alloc] initWithType:itemType]);
 
     [_actionSheet
@@ -147 +147 @@
 - (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];