Title: [176445] tags/Safari-601.1.10.1/Source/WebKit2
- Revision
- 176445
- Author
- [email protected]
- Date
- 2014-11-20 23:23:12 -0800 (Thu, 20 Nov 2014)
Log Message
Merged r176441. rdar://problem/19054967
Modified Paths
Diff
Modified: tags/Safari-601.1.10.1/Source/WebKit2/ChangeLog (176444 => 176445)
--- tags/Safari-601.1.10.1/Source/WebKit2/ChangeLog 2014-11-21 07:07:40 UTC (rev 176444)
+++ tags/Safari-601.1.10.1/Source/WebKit2/ChangeLog 2014-11-21 07:23:12 UTC (rev 176445)
@@ -1,3 +1,18 @@
+2014-11-20 Babak Shafiei <[email protected]>
+
+ Merge r176441.
+
+ 2014-11-20 Dan Bernstein <[email protected]>
+
+ 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 <[email protected]>
Merge r176337.
Modified: tags/Safari-601.1.10.1/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm (176444 => 176445)
--- tags/Safari-601.1.10.1/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm 2014-11-21 07:07:40 UTC (rev 176444)
+++ tags/Safari-601.1.10.1/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm 2014-11-21 07:23:12 UTC (rev 176445)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
