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

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

Issue 526413002: simplify (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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') | Source/core/html/MediaController.h » ('j') | 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 3ac7fb361e4a8d52d83bcdc7aa87ff4502ab0289..3243bf661495cfea649a64039de5d559ccb20d06 100644
--- a/Source/core/html/HTMLMediaElement.cpp
+++ b/Source/core/html/HTMLMediaElement.cpp
@@ -1825,7 +1825,7 @@ void HTMLMediaElement::setReadyState(ReadyState state)
scheduleEvent(EventTypeNames::loadedmetadata);
if (m_defaultPlaybackStartPosition > 0) {
- seek(m_defaultPlaybackStartPosition, IGNORE_EXCEPTION);
+ seek(m_defaultPlaybackStartPosition);
m_defaultPlaybackStartPosition = 0;
}
@@ -1929,7 +1929,7 @@ void HTMLMediaElement::prepareToPlay()
startDeferredLoad();
}
-void HTMLMediaElement::seek(double time, ExceptionState& exceptionState)
+void HTMLMediaElement::seek(double time)
{
WTF_LOG(Media, "HTMLMediaElement::seek(%f)", time);
@@ -2116,7 +2116,7 @@ void HTMLMediaElement::setCurrentTime(double time, ExceptionState& exceptionStat
return;
}
- seek(time, exceptionState);
+ seek(time);
}
double HTMLMediaElement::duration() const
@@ -2255,7 +2255,7 @@ void HTMLMediaElement::playInternal()
scheduleDelayedAction(LoadMediaResource);
if (endedPlayback())
- seek(0, IGNORE_EXCEPTION);
+ seek(0);
if (m_mediaController)
m_mediaController->bringElementUpToSpeed(this);
@@ -3117,7 +3117,7 @@ void HTMLMediaElement::mediaPlayerTimeChanged()
if (loop() && !m_mediaController) {
m_sentEndEvent = false;
// then seek to the earliest possible position of the media resource and abort these steps.
- seek(0, IGNORE_EXCEPTION);
+ seek(0);
} else {
// If the media element does not have a current media controller, and the media element
// has still ended playback, and the direction of playback is still forwards, and paused
@@ -3171,7 +3171,7 @@ void HTMLMediaElement::durationChanged(double duration, bool requestSeek)
renderer()->updateFromElement();
if (requestSeek)
- seek(duration, IGNORE_EXCEPTION);
+ seek(duration);
}
void HTMLMediaElement::mediaPlayerPlaybackStateChanged()
@@ -3202,10 +3202,10 @@ void HTMLMediaElement::mediaPlayerRequestSeek(double time)
{
// The player is the source of this seek request.
if (m_mediaController) {
- m_mediaController->setCurrentTime(time, IGNORE_EXCEPTION);
+ m_mediaController->setCurrentTime(time);
return;
}
- setCurrentTime(time, IGNORE_EXCEPTION);
+ setCurrentTime(time, ASSERT_NO_EXCEPTION);
}
// MediaPlayerPresentation methods
@@ -3903,7 +3903,7 @@ void HTMLMediaElement::applyMediaFragmentURI()
if (m_fragmentStartTime != MediaPlayer::invalidTime()) {
m_sentEndEvent = false;
UseCounter::count(document(), UseCounter::HTMLMediaElementSeekToFragmentStart);
- seek(m_fragmentStartTime, IGNORE_EXCEPTION);
+ seek(m_fragmentStartTime);
}
}
« no previous file with comments | « Source/core/html/HTMLMediaElement.h ('k') | Source/core/html/MediaController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698