Title: [208949] trunk/Source
- Revision
- 208949
- Author
- achristen...@apple.com
- Date
- 2016-11-21 08:58:00 -0800 (Mon, 21 Nov 2016)
Log Message
Fix Sierra CMake build after r208452
https://bugs.webkit.org/show_bug.cgi?id=164437
Source/WebKit/mac:
* WebView/WebView.mm:
(-[WebView updateMediaTouchBar]):
I haven't enabled VIDEO_PRESENTATION_MODE in the CMake build yet.
It's needed for playbackSessionInterface to exist.
Source/WebKit2:
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::updateMediaTouchBar):
I haven't enabled VIDEO_PRESENTATION_MODE in the CMake build yet.
It's needed for WebPlaybackSessionInterfaceMac to exist.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (208948 => 208949)
--- trunk/Source/WebKit/mac/ChangeLog 2016-11-21 16:25:49 UTC (rev 208948)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-11-21 16:58:00 UTC (rev 208949)
@@ -1,3 +1,13 @@
+2016-11-21 Alex Christensen <achristen...@webkit.org>
+
+ Fix Sierra CMake build after r208452
+ https://bugs.webkit.org/show_bug.cgi?id=164437
+
+ * WebView/WebView.mm:
+ (-[WebView updateMediaTouchBar]):
+ I haven't enabled VIDEO_PRESENTATION_MODE in the CMake build yet.
+ It's needed for playbackSessionInterface to exist.
+
2016-11-18 Enrica Casucci <enr...@apple.com>
Refactor drag and drop for WebKit2 to encode DragData message exchange.
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (208948 => 208949)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-11-21 16:25:49 UTC (rev 208948)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-11-21 16:58:00 UTC (rev 208949)
@@ -9514,7 +9514,7 @@
- (void)updateMediaTouchBar
{
-#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
+#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER) && ENABLE(VIDEO_PRESENTATION_MODE)
if (!_private->mediaTouchBarProvider)
_private->mediaTouchBarProvider = adoptNS([allocAVFunctionBarPlaybackControlsProviderInstance() init]);
Modified: trunk/Source/WebKit2/ChangeLog (208948 => 208949)
--- trunk/Source/WebKit2/ChangeLog 2016-11-21 16:25:49 UTC (rev 208948)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-21 16:58:00 UTC (rev 208949)
@@ -1,3 +1,13 @@
+2016-11-21 Alex Christensen <achristen...@webkit.org>
+
+ Fix Sierra CMake build after r208452
+ https://bugs.webkit.org/show_bug.cgi?id=164437
+
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::updateMediaTouchBar):
+ I haven't enabled VIDEO_PRESENTATION_MODE in the CMake build yet.
+ It's needed for WebPlaybackSessionInterfaceMac to exist.
+
2016-11-21 Carlos Garcia Campos <cgar...@igalia.com>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.15.2 release.
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (208948 => 208949)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-11-21 16:25:49 UTC (rev 208948)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-11-21 16:58:00 UTC (rev 208949)
@@ -1095,7 +1095,7 @@
void WebViewImpl::updateMediaTouchBar()
{
-#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
+#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER) && ENABLE(VIDEO_PRESENTATION_MODE)
if (!m_mediaTouchBarProvider)
m_mediaTouchBarProvider = adoptNS([allocAVFunctionBarPlaybackControlsProviderInstance() init]);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
