Title: [197431] trunk/Source/WebCore
- Revision
- 197431
- Author
- [email protected]
- Date
- 2016-03-01 18:07:20 -0800 (Tue, 01 Mar 2016)
Log Message
Attempt to fix the internal build.
* platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
(WebCore::MediaPlaybackTargetPickerMac::showPlaybackTargetPicker):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (197430 => 197431)
--- trunk/Source/WebCore/ChangeLog 2016-03-02 01:43:03 UTC (rev 197430)
+++ trunk/Source/WebCore/ChangeLog 2016-03-02 02:07:20 UTC (rev 197431)
@@ -1,3 +1,10 @@
+2016-03-01 Ada Chan <[email protected]>
+
+ Attempt to fix the internal build.
+
+ * platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
+ (WebCore::MediaPlaybackTargetPickerMac::showPlaybackTargetPicker):
+
2016-02-29 Ada Chan <[email protected]>
Adopt the new version of AVOutputDeviceMenuController's showMenuForRect method.
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm (197430 => 197431)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2016-03-02 01:43:03 UTC (rev 197430)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2016-03-02 02:07:20 UTC (rev 197431)
@@ -117,11 +117,16 @@
LOG(Media, "MediaPlaybackTargetPickerMac::showPlaybackTargetPicker - checkActiveRoute = %i", (int)checkActiveRoute);
AVOutputDeviceMenuControllerType *picker = devicePicker();
- if (![picker respondsToSelector:@selector(showMenuForRect:appearanceName:allowReselectionOfSelectedOutputDevice:customMenuItemTitle:customMenuItemEnabled:)] && ![picker respondsToSelector:@selector(showMenuForRect:appearanceName:allowReselectionOfSelectedOutputDevice:)])
+ if (![picker respondsToSelector:@selector(showMenuForRect:appearanceName:allowReselectionOfSelectedOutputDevice:)]
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+ && ![picker respondsToSelector:@selector(showMenuForRect:appearanceName:allowReselectionOfSelectedOutputDevice:customMenuItemTitle:customMenuItemEnabled:)]
+#endif
+ )
return;
m_showingMenu = true;
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
if ([picker respondsToSelector:@selector(showMenuForRect:appearanceName:allowReselectionOfSelectedOutputDevice:customMenuItemTitle:customMenuItemEnabled:)]) {
NSString *customMenuItemTitleNSString = customMenuItemTitle.isEmpty() ? nil : (NSString *)customMenuItemTitle;
switch ([picker showMenuForRect:location appearanceName:NSAppearanceNameVibrantLight allowReselectionOfSelectedOutputDevice:!checkActiveRoute customMenuItemTitle:customMenuItemTitleNSString customMenuItemEnabled:YES]) {
@@ -135,7 +140,9 @@
case AVOutputDeviceMenuControllerSelectionNone:
break;
}
- } else if ([picker showMenuForRect:location appearanceName:NSAppearanceNameVibrantLight allowReselectionOfSelectedOutputDevice:!checkActiveRoute]) {
+ } else
+#endif
+ if ([picker showMenuForRect:location appearanceName:NSAppearanceNameVibrantLight allowReselectionOfSelectedOutputDevice:!checkActiveRoute]) {
if (!checkActiveRoute)
currentDeviceDidChange();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
