| Index: Source/WebCore/html/shadow/MediaControlRootElement.cpp
|
| diff --git a/Source/WebCore/html/shadow/MediaControlRootElement.cpp b/Source/WebCore/html/shadow/MediaControlRootElement.cpp
|
| index 7aebd557e86c11a89ddc9fad9b96f69818698cc7..42e9f921a500af5acf09ab948de5d648f85e3a7c 100644
|
| --- a/Source/WebCore/html/shadow/MediaControlRootElement.cpp
|
| +++ b/Source/WebCore/html/shadow/MediaControlRootElement.cpp
|
| @@ -316,7 +316,7 @@ void MediaControlRootElement::playbackProgressed()
|
| {
|
| m_timeline->setPosition(m_mediaElement->currentTime());
|
| updateTimeDisplay();
|
| -
|
| +
|
| if (!m_isMouseOverControls && m_mediaElement->hasVideo())
|
| makeTransparent();
|
| }
|
| @@ -327,7 +327,7 @@ void MediaControlRootElement::playbackStopped()
|
| m_timeline->setPosition(m_mediaElement->currentTime());
|
| updateTimeDisplay();
|
| makeOpaque();
|
| -
|
| +
|
| stopHideFullscreenControlsTimer();
|
| }
|
|
|
| @@ -440,7 +440,7 @@ void MediaControlRootElement::exitedFullscreen()
|
| // And if we reenter fullscreen we also want the panel in the standard position.
|
| m_panel->resetPosition();
|
|
|
| - stopHideFullscreenControlsTimer();
|
| + stopHideFullscreenControlsTimer();
|
| }
|
|
|
| void MediaControlRootElement::showVolumeSlider()
|
| @@ -500,7 +500,7 @@ void MediaControlRootElement::startHideFullscreenControlsTimer()
|
| {
|
| if (!m_mediaElement->isFullscreen())
|
| return;
|
| -
|
| +
|
| m_hideFullscreenControlsTimer.startOneShot(timeWithoutMouseMovementBeforeHidingControls);
|
| }
|
|
|
| @@ -508,10 +508,10 @@ void MediaControlRootElement::hideFullscreenControlsTimerFired(Timer<MediaContro
|
| {
|
| if (!m_mediaElement->isPlaying())
|
| return;
|
| -
|
| +
|
| if (!m_mediaElement->isFullscreen())
|
| return;
|
| -
|
| +
|
| if (!shouldHideControls())
|
| return;
|
|
|
| @@ -532,6 +532,14 @@ const AtomicString& MediaControlRootElement::shadowPseudoId() const
|
| return id;
|
| }
|
|
|
| +void MediaControlRootElement::bufferingProgressed()
|
| +{
|
| + // We only need to update buffering progress when paused, during normal
|
| + // playback playbackProgressed() will take care of it.
|
| + if (m_mediaElement->paused())
|
| + m_timeline->setPosition(m_mediaElement->currentTime());
|
| +}
|
| +
|
| }
|
|
|
| #endif
|
|
|