OLD | NEW |
---|---|
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 Loading... | |
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 #if ENABLE(OILPAN) | |
109 removedFromMediaSource(); | |
haraken
2014/07/03 03:25:37
Just help me understand: What is this change for?
sof
2014/07/03 06:22:24
If MediaSource and HTMLMediaElement die at the sam
haraken
2014/07/03 06:40:31
Hmm, in my understanding, SourceBuffers are owned
sof
2014/07/03 06:52:25
That matches my understanding of ownership (via So
| |
110 #else | |
108 ASSERT(isRemoved()); | 111 ASSERT(isRemoved()); |
112 #endif | |
109 ASSERT(!m_loader); | 113 ASSERT(!m_loader); |
110 ASSERT(!m_stream); | 114 ASSERT(!m_stream); |
111 } | 115 } |
112 | 116 |
113 const AtomicString& SourceBuffer::segmentsKeyword() | 117 const AtomicString& SourceBuffer::segmentsKeyword() |
114 { | 118 { |
115 DEFINE_STATIC_LOCAL(const AtomicString, segments, ("segments", AtomicString: :ConstructFromLiteral)); | 119 DEFINE_STATIC_LOCAL(const AtomicString, segments, ("segments", AtomicString: :ConstructFromLiteral)); |
116 return segments; | 120 return segments; |
117 } | 121 } |
118 | 122 |
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
710 } | 714 } |
711 | 715 |
712 void SourceBuffer::trace(Visitor* visitor) | 716 void SourceBuffer::trace(Visitor* visitor) |
713 { | 717 { |
714 visitor->trace(m_source); | 718 visitor->trace(m_source); |
715 visitor->trace(m_stream); | 719 visitor->trace(m_stream); |
716 EventTargetWithInlineData::trace(visitor); | 720 EventTargetWithInlineData::trace(visitor); |
717 } | 721 } |
718 | 722 |
719 } // namespace WebCore | 723 } // namespace WebCore |
OLD | NEW |