Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1183)

Unified Diff: Source/core/html/HTMLMediaElement.cpp

Issue 594493003: Remove HTMLMediaElement::setPausedInternal() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: m_pausedInternal Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/HTMLMediaElement.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLMediaElement.cpp
diff --git a/Source/core/html/HTMLMediaElement.cpp b/Source/core/html/HTMLMediaElement.cpp
index b0c66c595aee4c68773af6c5ec4e52d032aa7635..7fd6e634215426d776835644faf5650db6582162 100644
--- a/Source/core/html/HTMLMediaElement.cpp
+++ b/Source/core/html/HTMLMediaElement.cpp
@@ -345,7 +345,6 @@ HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document& docum
, m_seeking(false)
, m_sentStalledEvent(false)
, m_sentEndEvent(false)
- , m_pausedInternal(false)
, m_closedCaptionsVisible(false)
, m_completelyLoaded(false)
, m_havePreparedToPlay(false)
@@ -3190,7 +3189,7 @@ void HTMLMediaElement::mediaPlayerPlaybackStateChanged()
{
WTF_LOG(Media, "HTMLMediaElement::mediaPlayerPlaybackStateChanged(%p)", this);
- if (!m_player || m_pausedInternal)
+ if (!webMediaPlayer())
return;
if (webMediaPlayer()->paused())
@@ -3356,16 +3355,6 @@ void HTMLMediaElement::updatePlayState()
return;
bool isPlaying = webMediaPlayer() && !webMediaPlayer()->paused();
- if (m_pausedInternal) {
- if (isPlaying)
- webMediaPlayer()->pause();
- refreshCachedTime();
- m_playbackProgressTimer.stop();
- if (hasMediaControls())
- mediaControls()->playbackStopped();
- return;
- }
-
bool shouldBePlaying = potentiallyPlaying();
WTF_LOG(Media, "HTMLMediaElement::updatePlayState(%p) - shouldBePlaying = %s, isPlaying = %s",
@@ -3412,12 +3401,6 @@ void HTMLMediaElement::updatePlayState()
renderer()->updateFromElement();
}
-void HTMLMediaElement::setPausedInternal(bool b)
-{
- m_pausedInternal = b;
- updatePlayState();
-}
-
void HTMLMediaElement::stopPeriodicTimers()
{
m_progressEventTimer.stop();
@@ -3518,7 +3501,6 @@ void HTMLMediaElement::stop()
m_playing = false;
m_paused = true;
m_seeking = false;
- setPausedInternal(true);
if (renderer())
renderer()->updateFromElement();
« no previous file with comments | « Source/core/html/HTMLMediaElement.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698