Attempted build fix.
authorbdakin@apple.com <bdakin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 16 Nov 2016 20:58:33 +0000 (20:58 +0000)
committerbdakin@apple.com <bdakin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 16 Nov 2016 20:58:33 +0000 (20:58 +0000)
* 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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@208805 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm

index 390c97a..57cbb66 100644 (file)
@@ -1,3 +1,17 @@
+2016-11-16  Beth Dakin  <bdakin@apple.com>
+
+        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  <beidson@apple.com>
 
         Re-indent some old headers.
index cd97900..6b079b0 100644 (file)
@@ -72,6 +72,8 @@ void WebPlaybackSessionInterfaceMac::durationChanged(double duration)
     // 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 @@ void WebPlaybackSessionInterfaceMac::currentTimeChanged(double currentTime, doub
 #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 @@ void WebPlaybackSessionInterfaceMac::rateChanged(bool isPlaying, float playbackR
     [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 @@ static RetainPtr<NSMutableArray> timeRangesToArray(const TimeRanges& timeRanges)
 
 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::invalidate()
 
 void WebPlaybackSessionInterfaceMac::ensureControlsManager()
 {
+#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
     playBackControlsManager();
+#endif
 }
 
 #if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)