Title: [208642] trunk/Source/WebCore
- Revision
- 208642
- Author
- [email protected]
- Date
- 2016-11-11 22:31:21 -0800 (Fri, 11 Nov 2016)
Log Message
SPI imports in AVKitSPI.h should be guarded by USE(APPLE_INTERNAL_SDK)
https://bugs.webkit.org/show_bug.cgi?id=164672
Reviewed by Dan Bernstein.
Fixes the OpenSource build when ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER) is on.
* platform/spi/cocoa/AVKitSPI.h: Add USE(APPLE_INTERNAL_SDK) guards around AVKit function bar SPI headers.
Additionally, define AVFunctionBarPlaybackControlsProvider in the case where AVKit SPI is unavailable.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (208641 => 208642)
--- trunk/Source/WebCore/ChangeLog 2016-11-12 05:03:27 UTC (rev 208641)
+++ trunk/Source/WebCore/ChangeLog 2016-11-12 06:31:21 UTC (rev 208642)
@@ -1,3 +1,15 @@
+2016-11-11 Wenson Hsieh <[email protected]>
+
+ SPI imports in AVKitSPI.h should be guarded by USE(APPLE_INTERNAL_SDK)
+ https://bugs.webkit.org/show_bug.cgi?id=164672
+
+ Reviewed by Dan Bernstein.
+
+ Fixes the OpenSource build when ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER) is on.
+
+ * platform/spi/cocoa/AVKitSPI.h: Add USE(APPLE_INTERNAL_SDK) guards around AVKit function bar SPI headers.
+ Additionally, define AVFunctionBarPlaybackControlsProvider in the case where AVKit SPI is unavailable.
+
2016-11-11 Ryosuke Niwa <[email protected]>
event.composedPath() does not include window
Modified: trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h (208641 => 208642)
--- trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h 2016-11-12 05:03:27 UTC (rev 208641)
+++ trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h 2016-11-12 06:31:21 UTC (rev 208642)
@@ -151,8 +151,9 @@
NS_ASSUME_NONNULL_END
-#if PLATFORM(MAC)
-#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
+#if PLATFORM(MAC) && ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
+
+#if USE(APPLE_INTERNAL_SDK)
#import <AVKit/AVFunctionBarPlaybackControlsProvider.h>
#import <AVKit/AVFunctionBarScrubber.h>
#else
@@ -169,6 +170,11 @@
@property (readonly) BOOL hasEnabledVideo;
@end
+@interface AVFunctionBarPlaybackControlsProvider : NSResponder
+@property (strong, readonly, nullable) NSTouchBar *touchBar;
+@property (nullable) id<AVFunctionBarPlaybackControlsControlling> playbackControlsController;
+@end
+
@interface AVFunctionBarScrubber : NSView
@property (assign, nullable) id<AVFunctionBarPlaybackControlsControlling> playbackControlsController;
@end
@@ -175,5 +181,6 @@
NS_ASSUME_NONNULL_END
-#endif // ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
-#endif // PLATFORM(MAC)
+#endif
+
+#endif // PLATFORM(MAC) && ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
