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

Side by Side 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, 5 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 , m_streamMaxSize(0) 98 , m_streamMaxSize(0)
99 , m_appendStreamAsyncPartRunner(this, &SourceBuffer::appendStreamAsyncPart) 99 , m_appendStreamAsyncPartRunner(this, &SourceBuffer::appendStreamAsyncPart)
100 { 100 {
101 ASSERT(m_webSourceBuffer); 101 ASSERT(m_webSourceBuffer);
102 ASSERT(m_source); 102 ASSERT(m_source);
103 ScriptWrappable::init(this); 103 ScriptWrappable::init(this);
104 } 104 }
105 105
106 SourceBuffer::~SourceBuffer() 106 SourceBuffer::~SourceBuffer()
107 { 107 {
108 // Oilpan: a SourceBuffer might be finalized without having been
109 // explicitly removed first, hence the asserts below will not
110 // hold.
111 #if !ENABLE(OILPAN)
108 ASSERT(isRemoved()); 112 ASSERT(isRemoved());
109 ASSERT(!m_loader); 113 ASSERT(!m_loader);
110 ASSERT(!m_stream); 114 ASSERT(!m_stream);
115 #endif
111 } 116 }
112 117
113 const AtomicString& SourceBuffer::segmentsKeyword() 118 const AtomicString& SourceBuffer::segmentsKeyword()
114 { 119 {
115 DEFINE_STATIC_LOCAL(const AtomicString, segments, ("segments", AtomicString: :ConstructFromLiteral)); 120 DEFINE_STATIC_LOCAL(const AtomicString, segments, ("segments", AtomicString: :ConstructFromLiteral));
116 return segments; 121 return segments;
117 } 122 }
118 123
119 const AtomicString& SourceBuffer::sequenceKeyword() 124 const AtomicString& SourceBuffer::sequenceKeyword()
120 { 125 {
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 } 715 }
711 716
712 void SourceBuffer::trace(Visitor* visitor) 717 void SourceBuffer::trace(Visitor* visitor)
713 { 718 {
714 visitor->trace(m_source); 719 visitor->trace(m_source);
715 visitor->trace(m_stream); 720 visitor->trace(m_stream);
716 EventTargetWithInlineData::trace(visitor); 721 EventTargetWithInlineData::trace(visitor);
717 } 722 }
718 723
719 } // namespace WebCore 724 } // namespace WebCore
OLDNEW
« 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