Index: Source/core/html/HTMLMediaElement.cpp |
diff --git a/Source/core/html/HTMLMediaElement.cpp b/Source/core/html/HTMLMediaElement.cpp |
index 42f201be24c22d76ea68cd36081d7fbe823fab14..a036d5b69bf3713218d30c119954534a8caf2ad8 100644 |
--- a/Source/core/html/HTMLMediaElement.cpp |
+++ b/Source/core/html/HTMLMediaElement.cpp |
@@ -1701,7 +1701,7 @@ void HTMLMediaElement::progressEventTimerFired(Timer<HTMLMediaElement>*) |
double time = WTF::currentTime(); |
double timedelta = time - m_previousProgressTime; |
- if (m_player->didLoadingProgress()) { |
+ if (webMediaPlayer() && webMediaPlayer()->didLoadingProgress()) { |
scheduleEvent(EventTypeNames::progress); |
m_previousProgressTime = time; |
m_sentStalledEvent = false; |
@@ -1974,15 +1974,15 @@ void HTMLMediaElement::setPlaybackRate(double rate) |
scheduleEvent(EventTypeNames::ratechange); |
} |
- if (m_player && potentiallyPlaying() && m_player->rate() != rate && !m_mediaController) |
- m_player->setRate(rate); |
+ if (m_player && potentiallyPlaying() && !m_mediaController && webMediaPlayer()) |
acolwell GONE FROM CHROMIUM
2014/06/02 23:01:14
I believe the webMediaPlayer() check is not necess
Srirama
2014/06/04 06:48:13
Done.
|
+ webMediaPlayer()->setRate(rate); |
} |
void HTMLMediaElement::updatePlaybackRate() |
{ |
double effectiveRate = m_mediaController ? m_mediaController->playbackRate() : m_playbackRate; |
- if (m_player && potentiallyPlaying() && m_player->rate() != effectiveRate) |
- m_player->setRate(effectiveRate); |
+ if (m_player && potentiallyPlaying() && webMediaPlayer()) |
acolwell GONE FROM CHROMIUM
2014/06/02 23:01:14
ditto
Srirama
2014/06/04 06:48:13
Done.
|
+ webMediaPlayer()->setRate(effectiveRate); |
} |
bool HTMLMediaElement::ended() const |
@@ -2888,7 +2888,10 @@ PassRefPtr<TimeRanges> HTMLMediaElement::buffered() const |
if (m_mediaSource) |
return m_mediaSource->buffered(); |
- return m_player->buffered(); |
+ if (!webMediaPlayer()) |
+ return TimeRanges::create(); |
+ |
+ return TimeRanges::create(webMediaPlayer()->buffered()); |
} |
PassRefPtr<TimeRanges> HTMLMediaElement::played() |
@@ -2907,8 +2910,8 @@ PassRefPtr<TimeRanges> HTMLMediaElement::played() |
PassRefPtr<TimeRanges> HTMLMediaElement::seekable() const |
{ |
- if (m_player) { |
- double maxTimeSeekable = m_player->maxTimeSeekable(); |
+ if (m_player && webMediaPlayer()) { |
acolwell GONE FROM CHROMIUM
2014/06/02 23:01:14
m_player shouldn't be needed now since it is cover
Srirama
2014/06/04 06:48:13
Done.
|
+ double maxTimeSeekable = webMediaPlayer()->maxTimeSeekable(); |
if (maxTimeSeekable) |
return TimeRanges::create(0, maxTimeSeekable); |
} |
@@ -3024,7 +3027,8 @@ void HTMLMediaElement::updatePlayState() |
if (playerPaused) { |
// Set rate, muted before calling play in case they were set before the media engine was setup. |
// The media engine should just stash the rate and muted values since it isn't already playing. |
- m_player->setRate(m_playbackRate); |
+ if (webMediaPlayer()) |
acolwell GONE FROM CHROMIUM
2014/06/02 23:01:14
I believe this is not necessary because I don't th
Srirama
2014/06/04 06:48:13
Done.
|
+ webMediaPlayer()->setRate(m_playbackRate); |
updateVolume(); |
m_player->play(); |