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

Unified Diff: Source/modules/mediasource/SourceBuffer.cpp

Issue 363953002: Oilpan: have the media element safely close its MediaSource. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Tidy clearing of m_attachedElement Created 6 years, 6 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/modules/mediasource/MediaSource.cpp ('k') | Source/modules/mediasource/SourceBufferList.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/mediasource/SourceBuffer.cpp
diff --git a/Source/modules/mediasource/SourceBuffer.cpp b/Source/modules/mediasource/SourceBuffer.cpp
index 741e25c67df41187718a190c119e5af95408a4ec..12031d31514362be45a4bd1ed60245126797d2c8 100644
--- a/Source/modules/mediasource/SourceBuffer.cpp
+++ b/Source/modules/mediasource/SourceBuffer.cpp
@@ -105,9 +105,14 @@ SourceBuffer::SourceBuffer(PassOwnPtr<WebSourceBuffer> webSourceBuffer, MediaSou
SourceBuffer::~SourceBuffer()
{
+ // Oilpan: a SourceBuffer might be finalized without having been
+ // explicitly removed first, hence the asserts below will not
+ // hold.
+#if !ENABLE(OILPAN)
ASSERT(isRemoved());
ASSERT(!m_loader);
ASSERT(!m_stream);
+#endif
}
const AtomicString& SourceBuffer::segmentsKeyword()
« no previous file with comments | « Source/modules/mediasource/MediaSource.cpp ('k') | Source/modules/mediasource/SourceBufferList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698