Changeset 201882 in webkit

Timestamp:

Jun 9, 2016 2:01:55 PM (8 years ago)

Author:

jer.noble@apple.com

Message:

Pass through play state and toggle state to the WebPlaybackControlsManager
​https://bugs.webkit.org/show_bug.cgi?id=158578
<rdar://problem/25045616>

Reviewed by Beth Dakin.

Pass through the isPlaying portion of setRate() and allow toggling when a model is present.

• platform/mac/WebPlaybackControlsManager.h:
• platform/mac/WebPlaybackControlsManager.mm:
• platform/mac/WebPlaybackSessionInterfaceMac.mm:

(WebCore::WebPlaybackSessionInterfaceMac::setRate):
(WebCore::WebPlaybackSessionInterfaceMac::setPlayBackControlsManager):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/WebPlaybackControlsManager.h (modified) (2 diffs)
• platform/mac/WebPlaybackControlsManager.mm (modified) (1 diff)
• platform/mac/WebPlaybackSessionInterfaceMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-09  Jer Noble  <jer.noble@apple.com>
+
+        Pass through play state and toggle state to the WebPlaybackControlsManager
+        https://bugs.webkit.org/show_bug.cgi?id=158578
+        <rdar://problem/25045616>
+
+        Reviewed by Beth Dakin.
+
+        Pass through the isPlaying portion of setRate() and allow toggling when a model is present.
+
+        * platform/mac/WebPlaybackControlsManager.h:
+        * platform/mac/WebPlaybackControlsManager.mm:
+        * platform/mac/WebPlaybackSessionInterfaceMac.mm:
+        (WebCore::WebPlaybackSessionInterfaceMac::setRate):
+        (WebCore::WebPlaybackSessionInterfaceMac::setPlayBackControlsManager):
+
 2016-06-09  Frederic Wang  <fred.wang@free.fr>
 

trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.h

@@ -50 +50 @@
     BOOL _hasEnabledVideo;
     float _rate;
+    BOOL _playing;
+    BOOL _canTogglePlayback;
 
 @private
@@ -62 +64 @@
 @property (readwrite) BOOL hasEnabledVideo;
 @property (nonatomic) float rate;
+@property (getter=isPlaying) BOOL playing;
+@property BOOL canTogglePlayback;
 
 - (void)setAudioMediaSelectionOptions:(const Vector<WTF::String>&)options withSelectedIndex:(NSUInteger)selectedIndex;

trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.mm

@@ -39 +39 @@
 @synthesize hasEnabledVideo=_hasEnabledVideo;
 @synthesize rate=_rate;
+@synthesize playing=_playing;
+@synthesize canTogglePlayback=_canTogglePlayback;
 
 - (AVValueTiming *)timing

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

@@ -89 +89 @@
     WebPlaybackControlsManager* controlsManager = playBackControlsManager();
     [controlsManager setRate:isPlaying ? playbackRate : 0.];
+    [controlsManager setPlaying:isPlaying];
 
     if (m_client)
@@ -158 +159 @@
     manager.rate = m_playbackSessionModel->isPlaying() ? m_playbackSessionModel->playbackRate() : 0.;
     manager.seekableTimeRanges = timeRangesToArray(m_playbackSessionModel->seekableRanges()).get();
+    manager.canTogglePlayback = YES;
+    manager.playing = m_playbackSessionModel->isPlaying();
     [manager setAudioMediaSelectionOptions:m_playbackSessionModel->audioMediaSelectionOptions() withSelectedIndex:static_cast<NSUInteger>(m_playbackSessionModel->audioMediaSelectedIndex())];
     [manager setLegibleMediaSelectionOptions:m_playbackSessionModel->legibleMediaSelectionOptions() withSelectedIndex:static_cast<NSUInteger>(m_playbackSessionModel->legibleMediaSelectedIndex())];