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

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

Issue 1306613002: Keep auxilliary media objects on the heap always. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 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/HTMLMediaSource.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 b7f70d2a5921f51a1fed75cc279e57da31fc1a21..5cca5fb0dc10f9703e4b77ad1b092c9dca7725c5 100644
--- a/Source/core/html/HTMLMediaElement.cpp
+++ b/Source/core/html/HTMLMediaElement.cpp
@@ -653,7 +653,7 @@ void HTMLMediaElement::loadTimerFired(Timer<HTMLMediaElement>*)
m_pendingActionFlags = 0;
}
-PassRefPtrWillBeRawPtr<MediaError> HTMLMediaElement::error() const
+MediaError* HTMLMediaElement::error() const
{
return m_error;
}
@@ -1286,7 +1286,7 @@ void HTMLMediaElement::noneSupported()
layoutObject()->updateFromElement();
}
-void HTMLMediaElement::mediaEngineError(PassRefPtrWillBeRawPtr<MediaError> err)
+void HTMLMediaElement::mediaEngineError(MediaError* err)
{
ASSERT(m_readyState >= HAVE_METADATA);
WTF_LOG(Media, "HTMLMediaElement::mediaEngineError(%p, %d)", this, static_cast<int>(err->code()));
@@ -1672,7 +1672,7 @@ void HTMLMediaElement::seek(double time)
// seekable attribute, then let it be the position in one of the ranges given in the seekable attribute
// that is the nearest to the new playback position. ... If there are no ranges given in the seekable
// attribute then set the seeking IDL attribute to false and abort these steps.
- RefPtrWillBeRawPtr<TimeRanges> seekableRanges = seekable();
+ TimeRanges* seekableRanges = seekable();
if (!seekableRanges->length()) {
m_seeking = false;
@@ -2865,7 +2865,7 @@ void HTMLMediaElement::sizeChanged()
layoutObject()->updateFromElement();
}
-PassRefPtrWillBeRawPtr<TimeRanges> HTMLMediaElement::buffered() const
+TimeRanges* HTMLMediaElement::buffered() const
{
if (m_mediaSource)
return m_mediaSource->buffered();
@@ -2876,7 +2876,7 @@ PassRefPtrWillBeRawPtr<TimeRanges> HTMLMediaElement::buffered() const
return TimeRanges::create(webMediaPlayer()->buffered());
}
-PassRefPtrWillBeRawPtr<TimeRanges> HTMLMediaElement::played()
+TimeRanges* HTMLMediaElement::played()
{
if (m_playing) {
double time = currentTime();
@@ -2890,7 +2890,7 @@ PassRefPtrWillBeRawPtr<TimeRanges> HTMLMediaElement::played()
return m_playedTimeRanges->copy();
}
-PassRefPtrWillBeRawPtr<TimeRanges> HTMLMediaElement::seekable() const
+TimeRanges* HTMLMediaElement::seekable() const
{
if (!webMediaPlayer())
return TimeRanges::create();
@@ -2944,7 +2944,7 @@ bool HTMLMediaElement::endedPlayback(LoopCondition loopCondition) const
bool HTMLMediaElement::stoppedDueToErrors() const
{
if (m_readyState >= HAVE_METADATA && m_error) {
- RefPtrWillBeRawPtr<TimeRanges> seekableRanges = seekable();
+ TimeRanges* seekableRanges = seekable();
if (!seekableRanges->contain(currentTime()))
return true;
}
« no previous file with comments | « Source/core/html/HTMLMediaElement.h ('k') | Source/core/html/HTMLMediaSource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698