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

Side by Side Diff: Source/WebCore/Modules/mediasource/MediaSource.h

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
« no previous file with comments | « Source/WTF/wtf/FeatureDefines.h ('k') | Source/WebCore/Modules/mediasource/MediaSource.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef MediaSource_h 31 #ifndef MediaSource_h
32 #define MediaSource_h 32 #define MediaSource_h
33 33
34 #if ENABLE(MEDIA_SOURCE)
35
36 #include "ActiveDOMObject.h" 34 #include "ActiveDOMObject.h"
37 #include "GenericEventQueue.h" 35 #include "GenericEventQueue.h"
38 #include "MediaSourcePrivate.h" 36 #include "MediaSourcePrivate.h"
39 #include "SourceBuffer.h" 37 #include "SourceBuffer.h"
40 #include "SourceBufferList.h" 38 #include "SourceBufferList.h"
41 #include <wtf/RefCounted.h> 39 #include <wtf/RefCounted.h>
42 40
43 namespace WebCore { 41 namespace WebCore {
44 42
45 class MediaSource : public RefCounted<MediaSource>, public EventTarget, public A ctiveDOMObject { 43 class MediaSource : public RefCounted<MediaSource>, public EventTarget, public A ctiveDOMObject {
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 OwnPtr<MediaSourcePrivate> m_private; 91 OwnPtr<MediaSourcePrivate> m_private;
94 92
95 RefPtr<SourceBufferList> m_sourceBuffers; 93 RefPtr<SourceBufferList> m_sourceBuffers;
96 RefPtr<SourceBufferList> m_activeSourceBuffers; 94 RefPtr<SourceBufferList> m_activeSourceBuffers;
97 OwnPtr<GenericEventQueue> m_asyncEventQueue; 95 OwnPtr<GenericEventQueue> m_asyncEventQueue;
98 }; 96 };
99 97
100 } // namespace WebCore 98 } // namespace WebCore
101 99
102 #endif 100 #endif
103 #endif
OLDNEW
« no previous file with comments | « Source/WTF/wtf/FeatureDefines.h ('k') | Source/WebCore/Modules/mediasource/MediaSource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698