Title: [264513] trunk/Source/WebCore/PAL
- Revision
- 264513
- Author
- [email protected]
- Date
- 2020-07-17 09:05:52 -0700 (Fri, 17 Jul 2020)
Log Message
Unreviewed, reverting r264493.
Part of an attempted fix for the build
Reverted changeset:
"Use AVRoutePickerView when available for choosing AirPlay
devices"
https://bugs.webkit.org/show_bug.cgi?id=213497
https://trac.webkit.org/changeset/264493
Modified Paths
Diff
Modified: trunk/Source/WebCore/PAL/ChangeLog (264512 => 264513)
--- trunk/Source/WebCore/PAL/ChangeLog 2020-07-17 16:04:25 UTC (rev 264512)
+++ trunk/Source/WebCore/PAL/ChangeLog 2020-07-17 16:05:52 UTC (rev 264513)
@@ -1,5 +1,18 @@
2020-07-17 Truitt Savell <[email protected]>
+ Unreviewed, reverting r264493.
+
+ Part of an attempted fix for the build
+
+ Reverted changeset:
+
+ "Use AVRoutePickerView when available for choosing AirPlay
+ devices"
+ https://bugs.webkit.org/show_bug.cgi?id=213497
+ https://trac.webkit.org/changeset/264493
+
+2020-07-17 Truitt Savell <[email protected]>
+
Unreviewed, reverting r264511.
Part of an attempted fix for the build
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/AVKitSPI.h (264512 => 264513)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/AVKitSPI.h 2020-07-17 16:04:25 UTC (rev 264512)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/AVKitSPI.h 2020-07-17 16:05:52 UTC (rev 264513)
@@ -228,9 +228,12 @@
#endif // PLATFORM(MAC)
#if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS_FAMILY)
+
#if USE(APPLE_INTERNAL_SDK)
#import <AVKit/AVOutputDeviceMenuController.h>
+#import <AVKit/AVRoutePickerView_Private.h>
+#import <AVKit/AVRoutePickerView_WebKitOnly.h>
#else
@@ -252,22 +255,6 @@
@end
-NS_ASSUME_NONNULL_END
-
-#endif // USE(APPLE_INTERNAL_SDK)
-#endif // ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS_FAMILY)
-
-#if HAVE(AVROUTEPICKERVIEW)
-#if USE(APPLE_INTERNAL_SDK)
-
-#import <AVKit/AVRoutePickerView.h>
-#import <AVKit/AVRoutePickerView_Private.h>
-#import <AVKit/AVRoutePickerView_WebKitOnly.h>
-
-#else
-
-NS_ASSUME_NONNULL_BEGIN
-
@protocol AVRoutePickerViewDelegate;
@interface AVRoutePickerView : NSView
@@ -288,8 +275,9 @@
NS_ASSUME_NONNULL_END
#endif // USE(APPLE_INTERNAL_SDK)
-#endif // HAVE(AVROUTEPICKERVIEW)
+#endif // ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS_FAMILY)
+
NS_ASSUME_NONNULL_BEGIN
@interface AVValueTiming : NSObject <NSCoding, NSCopying, NSMutableCopying>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
