Title: [187671] branches/safari-601.1-branch/Source/WebKit2
- Revision
- 187671
- Author
- [email protected]
- Date
- 2015-07-31 13:15:26 -0700 (Fri, 31 Jul 2015)
Log Message
Merge r187614. rdar://problem/22064327
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (187670 => 187671)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-31 20:01:59 UTC (rev 187670)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-31 20:15:26 UTC (rev 187671)
@@ -1,3 +1,19 @@
+2015-07-31 Matthew Hanson <[email protected]>
+
+ Merge r187614. rdar://problem/22064327
+
+ 2015-07-30 Eric Carlson <[email protected]>
+
+ [iOS] Set AirPlay discovery mode to disabled when page is hidden
+ https://bugs.webkit.org/show_bug.cgi?id=147455
+
+ Reviewed by Enrica Casucci.
+
+ * UIProcess/ios/forms/WKAirPlayRoutePicker.mm:
+ (-[WKAirPlayRoutePicker _dismissAirPlayRoutePickerIPad]): Set discovery mode to disabled after
+ the picker has been closed.
+ (-[WKAirPlayRoutePicker showAirPlayPickerIPhone:]): Ditto.
+
2015-07-31 Lucas Forschler <[email protected]>
Merge r187530
Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm (187670 => 187671)
--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm 2015-07-31 20:01:59 UTC (rev 187670)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm 2015-07-31 20:15:26 UTC (rev 187671)
@@ -93,6 +93,10 @@
- (void)_dismissAirPlayRoutePickerIPad
{
+ if (!_routingController)
+ return;
+
+ [_routingController setDiscoveryMode:MPRouteDiscoveryModeDisabled];
_routingController = nil;
if (!_popoverController)
@@ -134,6 +138,7 @@
return UIInterfaceOrientationMaskPortrait;
}
completionHandler:^{
+ [_routingController setDiscoveryMode:MPRouteDiscoveryModeDisabled];
_routingController = nil;
_actionSheet = nil;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
