Title: [176441] trunk/Source/WebKit2
- Revision
- 176441
- Author
- m...@apple.com
- Date
- 2014-11-20 22:59:12 -0800 (Thu, 20 Nov 2014)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (176440 => 176441)
--- trunk/Source/WebKit2/ChangeLog 2014-11-21 06:58:30 UTC (rev 176440)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-21 06:59:12 UTC (rev 176441)
@@ -1,3 +1,14 @@
+2014-11-20 Dan Bernstein <m...@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 <bpoul...@apple.com>
Remove the remaining vestiges of minimal-ui
Modified: trunk/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm (176440 => 176441)
--- trunk/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm 2014-11-21 06:58:30 UTC (rev 176440)
+++ trunk/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm 2014-11-21 06:59:12 UTC (rev 176441)
@@ -116,7 +116,7 @@
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 @@
if (_actionSheet)
return;
- _actionSheet = adoptNS([[getMPAudioVideoRoutingActionSheetClass() alloc] initWithType:itemType]);
+ _actionSheet = adoptNS([(MPAudioVideoRoutingActionSheet *)[getMPAudioVideoRoutingActionSheetClass() alloc] initWithType:itemType]);
[_actionSheet
showWithValidInterfaceOrientationMaskBlock:^UIInterfaceOrientationMask {
@@ -146,7 +146,7 @@
- (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;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
