| Index: Source/core/html/shadow/MediaControls.cpp
|
| diff --git a/Source/core/html/shadow/MediaControls.cpp b/Source/core/html/shadow/MediaControls.cpp
|
| index e2e5431ee3eee82a95a4b242692b452ae4047c7b..29bef6fc94f68fc1f96b5a94d99fa8b105f7d1fd 100644
|
| --- a/Source/core/html/shadow/MediaControls.cpp
|
| +++ b/Source/core/html/shadow/MediaControls.cpp
|
| @@ -61,7 +61,6 @@ MediaControls::MediaControls(HTMLMediaElement& mediaElement)
|
| , m_enclosure(0)
|
| , m_hideMediaControlsTimer(this, &MediaControls::hideMediaControlsTimerFired)
|
| , m_isMouseOverControls(false)
|
| - , m_isPausedForScrubbing(false)
|
| {
|
| }
|
|
|
| @@ -250,9 +249,6 @@ void MediaControls::playbackStopped()
|
|
|
| void MediaControls::updatePlayState()
|
| {
|
| - if (m_isPausedForScrubbing)
|
| - return;
|
| -
|
| if (m_overlayPlayButton)
|
| m_overlayPlayButton->updateDisplayType();
|
| m_playButton->updateDisplayType();
|
| @@ -260,19 +256,18 @@ void MediaControls::updatePlayState()
|
|
|
| void MediaControls::beginScrubbing()
|
| {
|
| - if (!mediaElement().togglePlayStateWillPlay()) {
|
| - m_isPausedForScrubbing = true;
|
| - mediaElement().togglePlayState();
|
| - }
|
| + if (mediaElement().controller())
|
| + mediaElement().controller()->beginScrubbing();
|
| + else
|
| + mediaElement().beginScrubbing();
|
| }
|
|
|
| void MediaControls::endScrubbing()
|
| {
|
| - if (m_isPausedForScrubbing) {
|
| - m_isPausedForScrubbing = false;
|
| - if (mediaElement().togglePlayStateWillPlay())
|
| - mediaElement().togglePlayState();
|
| - }
|
| + if (mediaElement().controller())
|
| + mediaElement().controller()->endScrubbing();
|
| + else
|
| + mediaElement().endScrubbing();
|
| }
|
|
|
| void MediaControls::updateCurrentTimeDisplay()
|
|
|