Title: [208805] trunk/Source/WebCore
- Revision
- 208805
- Author
- [email protected]
- Date
- 2016-11-16 12:58:33 -0800 (Wed, 16 Nov 2016)
Log Message
Attempted build fix.
* platform/mac/WebPlaybackSessionInterfaceMac.mm:
(WebCore::WebPlaybackSessionInterfaceMac::durationChanged):
(WebCore::WebPlaybackSessionInterfaceMac::currentTimeChanged):
(WebCore::WebPlaybackSessionInterfaceMac::rateChanged):
(WebCore::WebPlaybackSessionInterfaceMac::beginScrubbing):
(WebCore::WebPlaybackSessionInterfaceMac::seekableRangesChanged):
(WebCore::WebPlaybackSessionInterfaceMac::audioMediaSelectionOptionsChanged):
(WebCore::WebPlaybackSessionInterfaceMac::legibleMediaSelectionOptionsChanged):
(WebCore::WebPlaybackSessionInterfaceMac::ensureControlsManager):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (208804 => 208805)
--- trunk/Source/WebCore/ChangeLog 2016-11-16 20:43:14 UTC (rev 208804)
+++ trunk/Source/WebCore/ChangeLog 2016-11-16 20:58:33 UTC (rev 208805)
@@ -1,3 +1,17 @@
+2016-11-16 Beth Dakin <[email protected]>
+
+ Attempted build fix.
+
+ * platform/mac/WebPlaybackSessionInterfaceMac.mm:
+ (WebCore::WebPlaybackSessionInterfaceMac::durationChanged):
+ (WebCore::WebPlaybackSessionInterfaceMac::currentTimeChanged):
+ (WebCore::WebPlaybackSessionInterfaceMac::rateChanged):
+ (WebCore::WebPlaybackSessionInterfaceMac::beginScrubbing):
+ (WebCore::WebPlaybackSessionInterfaceMac::seekableRangesChanged):
+ (WebCore::WebPlaybackSessionInterfaceMac::audioMediaSelectionOptionsChanged):
+ (WebCore::WebPlaybackSessionInterfaceMac::legibleMediaSelectionOptionsChanged):
+ (WebCore::WebPlaybackSessionInterfaceMac::ensureControlsManager):
+
2016-11-16 Brady Eidson <[email protected]>
Re-indent some old headers.
Modified: trunk/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm (208804 => 208805)
--- trunk/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm 2016-11-16 20:43:14 UTC (rev 208804)
+++ trunk/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm 2016-11-16 20:58:33 UTC (rev 208805)
@@ -72,6 +72,8 @@
// FIXME: We take this as an indication that playback is ready, but that is not necessarily true.
controlsManager.hasEnabledAudio = YES;
controlsManager.hasEnabledVideo = YES;
+#else
+ UNUSED_PARAM(duration);
#endif
}
@@ -80,6 +82,9 @@
#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
WebPlaybackControlsManager* controlsManager = playBackControlsManager();
updatePlaybackControlsManagerTiming(currentTime, anchorTime, controlsManager.rate, controlsManager.playing);
+#else
+ UNUSED_PARAM(currentTime);
+ UNUSED_PARAM(anchorTime);
#endif
}
@@ -90,12 +95,17 @@
[controlsManager setRate:isPlaying ? playbackRate : 0.];
[controlsManager setPlaying:isPlaying];
updatePlaybackControlsManagerTiming(m_playbackSessionModel ? m_playbackSessionModel->currentTime() : 0, [[NSProcessInfo processInfo] systemUptime], playbackRate, isPlaying);
+#else
+ UNUSED_PARAM(isPlaying);
+ UNUSED_PARAM(playbackRate);
#endif
}
void WebPlaybackSessionInterfaceMac::beginScrubbing()
{
+#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
updatePlaybackControlsManagerTiming(m_playbackSessionModel ? m_playbackSessionModel->currentTime() : 0, [[NSProcessInfo processInfo] systemUptime], 0, false);
+#endif
webPlaybackSessionModel()->beginScrubbing();
}
@@ -119,17 +129,31 @@
void WebPlaybackSessionInterfaceMac::seekableRangesChanged(const TimeRanges& timeRanges)
{
+#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
[playBackControlsManager() setSeekableTimeRanges:timeRangesToArray(timeRanges).get()];
+#else
+ UNUSED_PARAM(timeRanges);
+#endif
}
void WebPlaybackSessionInterfaceMac::audioMediaSelectionOptionsChanged(const Vector<WTF::String>& options, uint64_t selectedIndex)
{
+#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
[playBackControlsManager() setAudioMediaSelectionOptions:options withSelectedIndex:static_cast<NSUInteger>(selectedIndex)];
+#else
+ UNUSED_PARAM(options);
+ UNUSED_PARAM(selectedIndex);
+#endif
}
void WebPlaybackSessionInterfaceMac::legibleMediaSelectionOptionsChanged(const Vector<WTF::String>& options, uint64_t selectedIndex)
{
+#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
[playBackControlsManager() setLegibleMediaSelectionOptions:options withSelectedIndex:static_cast<NSUInteger>(selectedIndex)];
+#else
+ UNUSED_PARAM(options);
+ UNUSED_PARAM(selectedIndex);
+#endif
}
void WebPlaybackSessionInterfaceMac::invalidate()
@@ -143,7 +167,9 @@
void WebPlaybackSessionInterfaceMac::ensureControlsManager()
{
+#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
playBackControlsManager();
+#endif
}
#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
