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

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

Issue 314823003: Remove HTMLMediaElement::pausedForUserInteraction(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 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 5a413b76a92dd59e447c11ba062f168869783f8c..a8b2f02c731996d6c2af6a302615410325d5e1ce 100644
--- a/Source/core/html/HTMLMediaElement.cpp
+++ b/Source/core/html/HTMLMediaElement.cpp
@@ -2940,7 +2940,7 @@ bool HTMLMediaElement::potentiallyPlaying() const
bool HTMLMediaElement::couldPlayIfEnoughData() const
{
- return !paused() && !endedPlayback() && !stoppedDueToErrors() && !pausedForUserInteraction();
+ return !paused() && !endedPlayback() && !stoppedDueToErrors();
}
bool HTMLMediaElement::endedPlayback() const
@@ -2982,12 +2982,6 @@ bool HTMLMediaElement::stoppedDueToErrors() const
return false;
}
-bool HTMLMediaElement::pausedForUserInteraction() const
-{
-// return !paused() && m_readyState >= HAVE_FUTURE_DATA && [UA requires a decitions from the user]
- return false;
-}
-
void HTMLMediaElement::updateVolume()
{
if (webMediaPlayer())
@@ -3551,11 +3545,11 @@ bool HTMLMediaElement::isBlocked() const
{
// A media element is a blocked media element if its readyState attribute is in the
// HAVE_NOTHING state, the HAVE_METADATA state, or the HAVE_CURRENT_DATA state,
+ // or if the element has paused for user interaction or paused for in-band content.
if (m_readyState <= HAVE_CURRENT_DATA)
return true;
- // or if the element has paused for user interaction.
- return pausedForUserInteraction();
+ return false;
}
bool HTMLMediaElement::isBlockedOnMediaController() const
« 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