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

Side by Side Diff: third_party/WebKit/Source/modules/mediasource/MediaSource.h

Issue 2780403004: Create core/html/media/ and move auxiliary media files in it. (Closed)
Patch Set: actually add autoplay files Created 3 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) 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 17 matching lines...) Expand all
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 #include <memory> 34 #include <memory>
35 #include "bindings/core/v8/ActiveScriptWrappable.h" 35 #include "bindings/core/v8/ActiveScriptWrappable.h"
36 #include "core/dom/ContextLifecycleObserver.h" 36 #include "core/dom/ContextLifecycleObserver.h"
37 #include "core/dom/ExceptionCode.h" 37 #include "core/dom/ExceptionCode.h"
38 #include "core/html/HTMLMediaSource.h"
39 #include "core/html/TimeRanges.h" 38 #include "core/html/TimeRanges.h"
40 #include "core/html/URLRegistry.h" 39 #include "core/html/URLRegistry.h"
40 #include "core/html/media/HTMLMediaSource.h"
41 #include "modules/EventTargetModules.h" 41 #include "modules/EventTargetModules.h"
42 #include "modules/mediasource/SourceBuffer.h" 42 #include "modules/mediasource/SourceBuffer.h"
43 #include "modules/mediasource/SourceBufferList.h" 43 #include "modules/mediasource/SourceBufferList.h"
44 #include "public/platform/WebMediaSource.h" 44 #include "public/platform/WebMediaSource.h"
45 #include "wtf/Vector.h" 45 #include "wtf/Vector.h"
46 46
47 namespace blink { 47 namespace blink {
48 48
49 class ExceptionState; 49 class ExceptionState;
50 class GenericEventQueue; 50 class GenericEventQueue;
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 Member<SourceBufferList> m_activeSourceBuffers; 154 Member<SourceBufferList> m_activeSourceBuffers;
155 155
156 Member<TimeRanges> m_liveSeekableRange; 156 Member<TimeRanges> m_liveSeekableRange;
157 157
158 int m_addedToRegistryCounter; 158 int m_addedToRegistryCounter;
159 }; 159 };
160 160
161 } // namespace blink 161 } // namespace blink
162 162
163 #endif // MediaSource_h 163 #endif // MediaSource_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698