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

Side by Side Diff: Source/modules/mediasource/WebKitMediaSource.h

Issue 14619016: Add WebKit prefix to MediaSource,SourceBuffer, and SourceBufferList objects. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 7 years, 7 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 | Annotate | Revision Log
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 10 matching lines...) Expand all
21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
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 WebKitMediaSource_h
32 #define MediaSource_h 32 #define WebKitMediaSource_h
33 33
34 #include "core/dom/ActiveDOMObject.h" 34 #include "core/dom/ActiveDOMObject.h"
35 #include "core/dom/GenericEventQueue.h" 35 #include "core/dom/GenericEventQueue.h"
36 #include "core/platform/graphics/MediaSourcePrivate.h" 36 #include "core/platform/graphics/MediaSourcePrivate.h"
37 #include "modules/mediasource/SourceBuffer.h" 37 #include "modules/mediasource/WebKitSourceBuffer.h"
38 #include "modules/mediasource/SourceBufferList.h" 38 #include "modules/mediasource/WebKitSourceBufferList.h"
39 #include "wtf/RefCounted.h" 39 #include "wtf/RefCounted.h"
40 40
41 namespace WebCore { 41 namespace WebCore {
42 42
43 class MediaSource : public RefCounted<MediaSource>, public EventTarget, public A ctiveDOMObject { 43 class WebKitMediaSource : public RefCounted<WebKitMediaSource>, public EventTarg et, public ActiveDOMObject {
44 public: 44 public:
45 static const String& openKeyword(); 45 static const String& openKeyword();
46 static const String& closedKeyword(); 46 static const String& closedKeyword();
47 static const String& endedKeyword(); 47 static const String& endedKeyword();
48 48
49 static PassRefPtr<MediaSource> create(ScriptExecutionContext*); 49 static PassRefPtr<WebKitMediaSource> create(ScriptExecutionContext*);
50 virtual ~MediaSource() { } 50 virtual ~WebKitMediaSource() { }
51 51
52 // MediaSource.idl methods 52 // WebKitMediaSource.idl methods
53 SourceBufferList* sourceBuffers(); 53 WebKitSourceBufferList* sourceBuffers();
54 SourceBufferList* activeSourceBuffers(); 54 WebKitSourceBufferList* activeSourceBuffers();
55 double duration() const; 55 double duration() const;
56 void setDuration(double, ExceptionCode&); 56 void setDuration(double, ExceptionCode&);
57 SourceBuffer* addSourceBuffer(const String& type, ExceptionCode&); 57 WebKitSourceBuffer* addSourceBuffer(const String& type, ExceptionCode&);
58 void removeSourceBuffer(SourceBuffer*, ExceptionCode&); 58 void removeSourceBuffer(WebKitSourceBuffer*, ExceptionCode&);
59 const String& readyState() const; 59 const String& readyState() const;
60 void setReadyState(const String&); 60 void setReadyState(const String&);
61 void endOfStream(const String& error, ExceptionCode&); 61 void endOfStream(const String& error, ExceptionCode&);
62 static bool isTypeSupported(const String& type); 62 static bool isTypeSupported(const String& type);
63 63
64 void setPrivateAndOpen(PassOwnPtr<MediaSourcePrivate>); 64 void setPrivateAndOpen(PassOwnPtr<MediaSourcePrivate>);
65 65
66 // EventTarget interface 66 // EventTarget interface
67 virtual const AtomicString& interfaceName() const OVERRIDE; 67 virtual const AtomicString& interfaceName() const OVERRIDE;
68 virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE; 68 virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE;
69 69
70 // ActiveDOMObject interface 70 // ActiveDOMObject interface
71 virtual bool hasPendingActivity() const OVERRIDE; 71 virtual bool hasPendingActivity() const OVERRIDE;
72 virtual void stop() OVERRIDE; 72 virtual void stop() OVERRIDE;
73 73
74 using RefCounted<MediaSource>::ref; 74 using RefCounted<WebKitMediaSource>::ref;
75 using RefCounted<MediaSource>::deref; 75 using RefCounted<WebKitMediaSource>::deref;
76 76
77 private: 77 private:
78 explicit MediaSource(ScriptExecutionContext*); 78 explicit WebKitMediaSource(ScriptExecutionContext*);
79 79
80 virtual EventTargetData* eventTargetData() OVERRIDE; 80 virtual EventTargetData* eventTargetData() OVERRIDE;
81 virtual EventTargetData* ensureEventTargetData() OVERRIDE; 81 virtual EventTargetData* ensureEventTargetData() OVERRIDE;
82 82
83 virtual void refEventTarget() OVERRIDE { ref(); } 83 virtual void refEventTarget() OVERRIDE { ref(); }
84 virtual void derefEventTarget() OVERRIDE { deref(); } 84 virtual void derefEventTarget() OVERRIDE { deref(); }
85 85
86 void scheduleEvent(const AtomicString& eventName); 86 void scheduleEvent(const AtomicString& eventName);
87 87
88 EventTargetData m_eventTargetData; 88 EventTargetData m_eventTargetData;
89 89
90 String m_readyState; 90 String m_readyState;
91 OwnPtr<MediaSourcePrivate> m_private; 91 OwnPtr<MediaSourcePrivate> m_private;
92 92
93 RefPtr<SourceBufferList> m_sourceBuffers; 93 RefPtr<WebKitSourceBufferList> m_sourceBuffers;
94 RefPtr<SourceBufferList> m_activeSourceBuffers; 94 RefPtr<WebKitSourceBufferList> m_activeSourceBuffers;
95 OwnPtr<GenericEventQueue> m_asyncEventQueue; 95 OwnPtr<GenericEventQueue> m_asyncEventQueue;
96 }; 96 };
97 97
98 } // namespace WebCore 98 } // namespace WebCore
99 99
100 #endif 100 #endif
OLDNEW
« no previous file with comments | « Source/modules/mediasource/SourceBufferList.idl ('k') | Source/modules/mediasource/WebKitMediaSource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698