Title: [215691] trunk/Source
- Revision
- 215691
- Author
- aes...@apple.com
- Date
- 2017-04-24 13:46:41 -0700 (Mon, 24 Apr 2017)
Log Message
[macOS] Enable media selection button on AVTouchBarScrubber
https://bugs.webkit.org/show_bug.cgi?id=171149
<rdar://problem/29875010>
Reviewed by Beth Dakin.
Source/WebCore:
* platform/spi/cocoa/AVKitSPI.h:
Source/WebKit2:
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::updateMediaTouchBar):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (215690 => 215691)
--- trunk/Source/WebCore/ChangeLog 2017-04-24 19:48:20 UTC (rev 215690)
+++ trunk/Source/WebCore/ChangeLog 2017-04-24 20:46:41 UTC (rev 215691)
@@ -1,3 +1,13 @@
+2017-04-24 Andy Estes <aes...@apple.com>
+
+ [macOS] Enable media selection button on AVTouchBarScrubber
+ https://bugs.webkit.org/show_bug.cgi?id=171149
+ <rdar://problem/29875010>
+
+ Reviewed by Beth Dakin.
+
+ * platform/spi/cocoa/AVKitSPI.h:
+
2017-04-24 Alex Christensen <achristen...@webkit.org>
Reduce copies and allocations in SharedBuffer::append
Modified: trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h (215690 => 215691)
--- trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h 2017-04-24 19:48:20 UTC (rev 215690)
+++ trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h 2017-04-24 20:46:41 UTC (rev 215691)
@@ -221,6 +221,7 @@
@interface AVTouchBarScrubber : NSView
@property (assign, nullable) id<AVTouchBarPlaybackControlsControlling> playbackControlsController;
+@property BOOL canShowMediaSelectionButton;
@end
@class AVThumbnail;
Modified: trunk/Source/WebKit2/ChangeLog (215690 => 215691)
--- trunk/Source/WebKit2/ChangeLog 2017-04-24 19:48:20 UTC (rev 215690)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-24 20:46:41 UTC (rev 215691)
@@ -1,3 +1,14 @@
+2017-04-24 Andy Estes <aes...@apple.com>
+
+ [macOS] Enable media selection button on AVTouchBarScrubber
+ https://bugs.webkit.org/show_bug.cgi?id=171149
+ <rdar://problem/29875010>
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::updateMediaTouchBar):
+
2017-04-24 Alex Christensen <achristen...@webkit.org>
Reduce copies and allocations in SharedBuffer::append
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (215690 => 215691)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2017-04-24 19:48:20 UTC (rev 215690)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2017-04-24 20:46:41 UTC (rev 215691)
@@ -67,6 +67,7 @@
#import "_WKRemoteObjectRegistryInternal.h"
#import "_WKThumbnailViewInternal.h"
#import <HIToolbox/CarbonEventsCore.h>
+#import <WebCore/AVKitSPI.h>
#import <WebCore/AXObjectCache.h>
#import <WebCore/ActivityState.h>
#import <WebCore/ColorMac.h>
@@ -127,6 +128,13 @@
- (BOOL)handleEventByKeyboardLayout:(NSEvent *)event;
@end
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
+// FIXME: Remove this once -setCanShowMediaSelectionButton: is declared in an SDK used by Apple's buildbot.
+@interface AVTouchBarScrubber ()
+- (void)setCanShowMediaSelectionButton:(BOOL)canShowMediaSelectionButton;
+@end
+#endif
+
@interface WKAccessibilitySettingsObserver : NSObject {
WebKit::WebViewImpl *_impl;
}
@@ -1140,6 +1148,9 @@
if (!m_mediaPlaybackControlsView) {
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
m_mediaPlaybackControlsView = adoptNS([allocAVTouchBarScrubberInstance() init]);
+ // FIXME: Remove this once setCanShowMediaSelectionButton: is declared in an SDK used by Apple's buildbot.
+ if ([m_mediaPlaybackControlsView respondsToSelector:@selector(setCanShowMediaSelectionButton:)])
+ [m_mediaPlaybackControlsView setCanShowMediaSelectionButton:YES];
#else
m_mediaPlaybackControlsView = adoptNS([allocAVFunctionBarScrubberInstance() init]);
#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
