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

Unified Diff: Source/core/html/MediaController.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/MediaController.h ('k') | Source/core/html/MediaError.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/MediaController.cpp
diff --git a/Source/core/html/MediaController.cpp b/Source/core/html/MediaController.cpp
index 1bd53dcf1a07d2cd5f0e9dfe386c153413b770b4..5b552e41841dcd5ce505341f4bbea496b1dea27c 100644
--- a/Source/core/html/MediaController.cpp
+++ b/Source/core/html/MediaController.cpp
@@ -84,7 +84,7 @@ void MediaController::removeMediaElement(HTMLMediaElement* element)
m_mediaElements.remove(m_mediaElements.find(element));
}
-PassRefPtrWillBeRawPtr<TimeRanges> MediaController::buffered() const
+TimeRanges* MediaController::buffered() const
{
if (m_mediaElements.isEmpty())
return TimeRanges::create();
@@ -93,13 +93,13 @@ PassRefPtrWillBeRawPtr<TimeRanges> MediaController::buffered() const
// the intersection of the ranges of the media resources of the slaved media elements that the
// user agent has buffered, at the time the attribute is evaluated.
MediaElementSequence::const_iterator it = m_mediaElements.begin();
- RefPtrWillBeRawPtr<TimeRanges> bufferedRanges = (*it)->buffered();
+ TimeRanges* bufferedRanges = (*it)->buffered();
for (++it; it != m_mediaElements.end(); ++it)
- bufferedRanges->intersectWith((*it)->buffered().get());
+ bufferedRanges->intersectWith((*it)->buffered());
return bufferedRanges;
}
-PassRefPtrWillBeRawPtr<TimeRanges> MediaController::seekable() const
+TimeRanges* MediaController::seekable() const
{
if (m_mediaElements.isEmpty())
return TimeRanges::create();
@@ -108,13 +108,13 @@ PassRefPtrWillBeRawPtr<TimeRanges> MediaController::seekable() const
// the intersection of the ranges of the media resources of the slaved media elements that the
// user agent is able to seek to, at the time the attribute is evaluated.
MediaElementSequence::const_iterator it = m_mediaElements.begin();
- RefPtrWillBeRawPtr<TimeRanges> seekableRanges = (*it)->seekable();
+ TimeRanges* seekableRanges = (*it)->seekable();
for (++it; it != m_mediaElements.end(); ++it)
- seekableRanges->intersectWith((*it)->seekable().get());
+ seekableRanges->intersectWith((*it)->seekable());
return seekableRanges;
}
-PassRefPtrWillBeRawPtr<TimeRanges> MediaController::played()
+TimeRanges* MediaController::played()
{
if (m_mediaElements.isEmpty())
return TimeRanges::create();
@@ -123,9 +123,9 @@ PassRefPtrWillBeRawPtr<TimeRanges> MediaController::played()
// the union of the ranges of the media resources of the slaved media elements that the
// user agent has so far rendered, at the time the attribute is evaluated.
MediaElementSequence::const_iterator it = m_mediaElements.begin();
- RefPtrWillBeRawPtr<TimeRanges> playedRanges = (*it)->played();
+ TimeRanges* playedRanges = (*it)->played();
for (++it; it != m_mediaElements.end(); ++it)
- playedRanges->unionWith((*it)->played().get());
+ playedRanges->unionWith((*it)->played());
return playedRanges;
}
« no previous file with comments | « Source/core/html/MediaController.h ('k') | Source/core/html/MediaError.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698