Title: [215329] trunk/Source
- Revision
- 215329
- Author
- achristen...@apple.com
- Date
- 2017-04-13 11:53:23 -0700 (Thu, 13 Apr 2017)
Log Message
Fix CMake build
https://bugs.webkit.org/show_bug.cgi?id=170815
Reviewed by Beth Dakin.
Source/WebCore:
* platform/spi/cocoa/AVKitSPI.h:
Source/WebKit2:
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration _setShouldCaptureAudioInUIProcess:]):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (215328 => 215329)
--- trunk/Source/WebCore/ChangeLog 2017-04-13 18:44:25 UTC (rev 215328)
+++ trunk/Source/WebCore/ChangeLog 2017-04-13 18:53:23 UTC (rev 215329)
@@ -1,3 +1,12 @@
+2017-04-13 Alex Christensen <achristen...@webkit.org>
+
+ Fix CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=170815
+
+ Reviewed by Beth Dakin.
+
+ * platform/spi/cocoa/AVKitSPI.h:
+
2017-04-13 JF Bastien <jfbast...@apple.com>
cmake build fix
Modified: trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h (215328 => 215329)
--- trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h 2017-04-13 18:44:25 UTC (rev 215328)
+++ trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h 2017-04-13 18:53:23 UTC (rev 215329)
@@ -172,8 +172,9 @@
#import <AVKit/AVFunctionBarPlaybackControlsProvider.h>
#import <AVKit/AVFunctionBarScrubber.h>
#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
-#else
+#elif __MAC_OS_X_VERSION_MAX_ALLOWED < 101300
+
NS_ASSUME_NONNULL_BEGIN
@protocol AVFunctionBarPlaybackControlsControlling <NSObject>
@@ -199,6 +200,33 @@
NS_ASSUME_NONNULL_END
+#else
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol AVTouchBarPlaybackControlsControlling <NSObject>
+ @property (readonly) NSTimeInterval contentDuration;
+ @property (readonly, nullable) AVValueTiming *timing;
+ @property (readonly, getter = isSeeking) BOOL seeking;
+ @property (readonly) NSTimeInterval seekToTime;
+- (void)seekToTime:(NSTimeInterval)time toleranceBefore:(NSTimeInterval)toleranceBefore toleranceAfter:(NSTimeInterval)toleranceAfter;
+ @property (readonly) BOOL hasEnabledAudio;
+ @property (readonly) BOOL hasEnabledVideo;
+ @end
+
+@interface AVTouchBarPlaybackControlsProvider : NSResponder
+ @property (strong, readonly, nullable) NSTouchBar *touchBar;
+ @property (assign, nullable) id<AVTouchBarPlaybackControlsControlling> playbackControlsController;
+ @end
+
+@interface AVTouchBarScrubber : NSView
+ @property (assign, nullable) id<AVTouchBarPlaybackControlsControlling> playbackControlsController;
+ @end
+
+@class AVThumbnail;
+
+NS_ASSUME_NONNULL_END
+
#endif
#endif // PLATFORM(MAC) && ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
Modified: trunk/Source/WebKit2/ChangeLog (215328 => 215329)
--- trunk/Source/WebKit2/ChangeLog 2017-04-13 18:44:25 UTC (rev 215328)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-13 18:53:23 UTC (rev 215329)
@@ -1,3 +1,13 @@
+2017-04-13 Alex Christensen <achristen...@webkit.org>
+
+ Fix CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=170815
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration _setShouldCaptureAudioInUIProcess:]):
+
2017-04-12 Dan Bernstein <m...@apple.com>
[Mac] Future-proof .xcconfig files
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (215328 => 215329)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2017-04-13 18:44:25 UTC (rev 215328)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2017-04-13 18:53:23 UTC (rev 215329)
@@ -757,12 +757,9 @@
{
#if ENABLE(MEDIA_STREAM)
_shouldCaptureAudioInUIProcess = value;
-#else
- return NO;
#endif
}
-
#if PLATFORM(MAC)
- (BOOL)_showsURLsInToolTips
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
