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

Side by Side Diff: Source/modules/mediastream/MediaStream.h

Issue 17351003: Rename ContextDestructionObserver to ContextLifecycleObserver (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Reapplied Created 7 years, 6 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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * Copyright (C) 2011 Ericsson AB. All rights reserved. 3 * Copyright (C) 2011 Ericsson AB. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y 14 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y 17 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y
18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N 20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N
21 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
23 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef MediaStream_h 26 #ifndef MediaStream_h
27 #define MediaStream_h 27 #define MediaStream_h
28 28
29 #include "bindings/v8/ScriptWrappable.h" 29 #include "bindings/v8/ScriptWrappable.h"
30 #include "core/dom/ContextDestructionObserver.h" 30 #include "core/dom/ContextLifecycleObserver.h"
31 #include "core/dom/EventTarget.h" 31 #include "core/dom/EventTarget.h"
32 #include "core/dom/ExceptionBase.h" 32 #include "core/dom/ExceptionBase.h"
33 #include "core/html/URLRegistry.h" 33 #include "core/html/URLRegistry.h"
34 #include "core/platform/Timer.h" 34 #include "core/platform/Timer.h"
35 #include "core/platform/mediastream/MediaStreamDescriptor.h" 35 #include "core/platform/mediastream/MediaStreamDescriptor.h"
36 #include "modules/mediastream/MediaStreamTrack.h" 36 #include "modules/mediastream/MediaStreamTrack.h"
37 #include "wtf/RefCounted.h" 37 #include "wtf/RefCounted.h"
38 #include "wtf/RefPtr.h" 38 #include "wtf/RefPtr.h"
39 39
40 namespace WebCore { 40 namespace WebCore {
41 41
42 class MediaStream : public RefCounted<MediaStream>, public ScriptWrappable, publ ic URLRegistrable, public MediaStreamDescriptorClient, public EventTarget, publi c ContextDestructionObserver { 42 class MediaStream : public RefCounted<MediaStream>, public ScriptWrappable, publ ic URLRegistrable, public MediaStreamDescriptorClient, public EventTarget, publi c ContextLifecycleObserver {
43 public: 43 public:
44 static PassRefPtr<MediaStream> create(ScriptExecutionContext*); 44 static PassRefPtr<MediaStream> create(ScriptExecutionContext*);
45 static PassRefPtr<MediaStream> create(ScriptExecutionContext*, PassRefPtr<Me diaStream>); 45 static PassRefPtr<MediaStream> create(ScriptExecutionContext*, PassRefPtr<Me diaStream>);
46 static PassRefPtr<MediaStream> create(ScriptExecutionContext*, const MediaSt reamTrackVector&); 46 static PassRefPtr<MediaStream> create(ScriptExecutionContext*, const MediaSt reamTrackVector&);
47 static PassRefPtr<MediaStream> create(ScriptExecutionContext*, PassRefPtr<Me diaStreamDescriptor>); 47 static PassRefPtr<MediaStream> create(ScriptExecutionContext*, PassRefPtr<Me diaStreamDescriptor>);
48 virtual ~MediaStream(); 48 virtual ~MediaStream();
49 49
50 // DEPRECATED 50 // DEPRECATED
51 String label() const { return m_descriptor->id(); } 51 String label() const { return m_descriptor->id(); }
52 52
(...skipping 29 matching lines...) Expand all
82 // URLRegistrable 82 // URLRegistrable
83 virtual URLRegistry& registry() const OVERRIDE; 83 virtual URLRegistry& registry() const OVERRIDE;
84 84
85 protected: 85 protected:
86 MediaStream(ScriptExecutionContext*, PassRefPtr<MediaStreamDescriptor>); 86 MediaStream(ScriptExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
87 87
88 // EventTarget 88 // EventTarget
89 virtual EventTargetData* eventTargetData() OVERRIDE; 89 virtual EventTargetData* eventTargetData() OVERRIDE;
90 virtual EventTargetData* ensureEventTargetData() OVERRIDE; 90 virtual EventTargetData* ensureEventTargetData() OVERRIDE;
91 91
92 // ContextDestructionObserver 92 // ContextLifecycleObserver
93 virtual void contextDestroyed(); 93 virtual void contextDestroyed();
94 94
95 private: 95 private:
96 // EventTarget 96 // EventTarget
97 virtual void refEventTarget() OVERRIDE { ref(); } 97 virtual void refEventTarget() OVERRIDE { ref(); }
98 virtual void derefEventTarget() OVERRIDE { deref(); } 98 virtual void derefEventTarget() OVERRIDE { deref(); }
99 99
100 // MediaStreamDescriptorClient 100 // MediaStreamDescriptorClient
101 virtual void addRemoteTrack(MediaStreamComponent*) OVERRIDE; 101 virtual void addRemoteTrack(MediaStreamComponent*) OVERRIDE;
102 virtual void removeRemoteTrack(MediaStreamComponent*) OVERRIDE; 102 virtual void removeRemoteTrack(MediaStreamComponent*) OVERRIDE;
(...skipping 11 matching lines...) Expand all
114 114
115 Timer<MediaStream> m_scheduledEventTimer; 115 Timer<MediaStream> m_scheduledEventTimer;
116 Vector<RefPtr<Event> > m_scheduledEvents; 116 Vector<RefPtr<Event> > m_scheduledEvents;
117 }; 117 };
118 118
119 typedef Vector<RefPtr<MediaStream> > MediaStreamVector; 119 typedef Vector<RefPtr<MediaStream> > MediaStreamVector;
120 120
121 } // namespace WebCore 121 } // namespace WebCore
122 122
123 #endif // MediaStream_h 123 #endif // MediaStream_h
OLDNEW
« no previous file with comments | « Source/modules/encryptedmedia/MediaKeySession.cpp ('k') | Source/modules/mediastream/MediaStream.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698