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

Side by Side Diff: Source/WebCore/Modules/mediasource/SourceBuffer.cpp

Issue 13674022: Remove MEDIA_SOURCE feature define. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@blink-master
Patch Set: Rebase Created 7 years, 8 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "SourceBuffer.h" 32 #include "SourceBuffer.h"
33 33
34 #if ENABLE(MEDIA_SOURCE)
35
36 #include "MediaSource.h" 34 #include "MediaSource.h"
37 #include "SourceBufferPrivate.h" 35 #include "SourceBufferPrivate.h"
38 #include "TimeRanges.h" 36 #include "TimeRanges.h"
39 #include <wtf/Uint8Array.h> 37 #include <wtf/Uint8Array.h>
40 38
41 namespace WebCore { 39 namespace WebCore {
42 40
43 PassRefPtr<SourceBuffer> SourceBuffer::create(PassOwnPtr<SourceBufferPrivate> so urceBufferPrivate, PassRefPtr<MediaSource> source) 41 PassRefPtr<SourceBuffer> SourceBuffer::create(PassOwnPtr<SourceBufferPrivate> so urceBufferPrivate, PassRefPtr<MediaSource> source)
44 { 42 {
45 return adoptRef(new SourceBuffer(sourceBufferPrivate, source)); 43 return adoptRef(new SourceBuffer(sourceBufferPrivate, source));
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 return m_source->readyState() == MediaSource::openKeyword(); 168 return m_source->readyState() == MediaSource::openKeyword();
171 } 169 }
172 170
173 bool SourceBuffer::isEnded() const 171 bool SourceBuffer::isEnded() const
174 { 172 {
175 ASSERT(m_source); 173 ASSERT(m_source);
176 return m_source->readyState() == MediaSource::endedKeyword(); 174 return m_source->readyState() == MediaSource::endedKeyword();
177 } 175 }
178 176
179 } // namespace WebCore 177 } // namespace WebCore
180
181 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/Modules/mediasource/SourceBuffer.h ('k') | Source/WebCore/Modules/mediasource/SourceBuffer.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698