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

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

Issue 135653002: Update modules classes to use OVERRIDE / FINAL when needed (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove change to web/ Created 6 years, 11 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
(...skipping 22 matching lines...) Expand all
33 #include "core/platform/mediastream/MediaStreamDescriptor.h" 33 #include "core/platform/mediastream/MediaStreamDescriptor.h"
34 #include "modules/mediastream/MediaStreamTrack.h" 34 #include "modules/mediastream/MediaStreamTrack.h"
35 #include "platform/Timer.h" 35 #include "platform/Timer.h"
36 #include "wtf/RefCounted.h" 36 #include "wtf/RefCounted.h"
37 #include "wtf/RefPtr.h" 37 #include "wtf/RefPtr.h"
38 38
39 namespace WebCore { 39 namespace WebCore {
40 40
41 class ExceptionState; 41 class ExceptionState;
42 42
43 class MediaStream : public RefCounted<MediaStream>, public ScriptWrappable, publ ic URLRegistrable, public MediaStreamDescriptorClient, public EventTargetWithInl ineData, public ContextLifecycleObserver { 43 class MediaStream FINAL : public RefCounted<MediaStream>, public ScriptWrappable , public URLRegistrable, public MediaStreamDescriptorClient, public EventTargetW ithInlineData, public ContextLifecycleObserver {
44 REFCOUNTED_EVENT_TARGET(MediaStream); 44 REFCOUNTED_EVENT_TARGET(MediaStream);
45 public: 45 public:
46 static PassRefPtr<MediaStream> create(ExecutionContext*); 46 static PassRefPtr<MediaStream> create(ExecutionContext*);
47 static PassRefPtr<MediaStream> create(ExecutionContext*, PassRefPtr<MediaStr eam>); 47 static PassRefPtr<MediaStream> create(ExecutionContext*, PassRefPtr<MediaStr eam>);
48 static PassRefPtr<MediaStream> create(ExecutionContext*, const MediaStreamTr ackVector&); 48 static PassRefPtr<MediaStream> create(ExecutionContext*, const MediaStreamTr ackVector&);
49 static PassRefPtr<MediaStream> create(ExecutionContext*, PassRefPtr<MediaStr eamDescriptor>); 49 static PassRefPtr<MediaStream> create(ExecutionContext*, PassRefPtr<MediaStr eamDescriptor>);
50 virtual ~MediaStream(); 50 virtual ~MediaStream();
51 51
52 // DEPRECATED 52 // DEPRECATED
53 String label() const { return m_descriptor->id(); } 53 String label() const { return m_descriptor->id(); }
(...skipping 24 matching lines...) Expand all
78 virtual const AtomicString& interfaceName() const OVERRIDE; 78 virtual const AtomicString& interfaceName() const OVERRIDE;
79 virtual ExecutionContext* executionContext() const OVERRIDE; 79 virtual ExecutionContext* executionContext() const OVERRIDE;
80 80
81 // URLRegistrable 81 // URLRegistrable
82 virtual URLRegistry& registry() const OVERRIDE; 82 virtual URLRegistry& registry() const OVERRIDE;
83 83
84 protected: 84 protected:
85 MediaStream(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>); 85 MediaStream(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
86 86
87 // ContextLifecycleObserver 87 // ContextLifecycleObserver
88 virtual void contextDestroyed(); 88 virtual void contextDestroyed() OVERRIDE;
89 89
90 private: 90 private:
91 // MediaStreamDescriptorClient 91 // MediaStreamDescriptorClient
92 virtual void addRemoteTrack(MediaStreamComponent*) OVERRIDE; 92 virtual void addRemoteTrack(MediaStreamComponent*) OVERRIDE;
93 virtual void removeRemoteTrack(MediaStreamComponent*) OVERRIDE; 93 virtual void removeRemoteTrack(MediaStreamComponent*) OVERRIDE;
94 94
95 void scheduleDispatchEvent(PassRefPtr<Event>); 95 void scheduleDispatchEvent(PassRefPtr<Event>);
96 void scheduledEventTimerFired(Timer<MediaStream>*); 96 void scheduledEventTimerFired(Timer<MediaStream>*);
97 97
98 bool m_stopped; 98 bool m_stopped;
99 99
100 MediaStreamTrackVector m_audioTracks; 100 MediaStreamTrackVector m_audioTracks;
101 MediaStreamTrackVector m_videoTracks; 101 MediaStreamTrackVector m_videoTracks;
102 RefPtr<MediaStreamDescriptor> m_descriptor; 102 RefPtr<MediaStreamDescriptor> m_descriptor;
103 103
104 Timer<MediaStream> m_scheduledEventTimer; 104 Timer<MediaStream> m_scheduledEventTimer;
105 Vector<RefPtr<Event> > m_scheduledEvents; 105 Vector<RefPtr<Event> > m_scheduledEvents;
106 }; 106 };
107 107
108 typedef Vector<RefPtr<MediaStream> > MediaStreamVector; 108 typedef Vector<RefPtr<MediaStream> > MediaStreamVector;
109 109
110 } // namespace WebCore 110 } // namespace WebCore
111 111
112 #endif // MediaStream_h 112 #endif // MediaStream_h
OLDNEW
« no previous file with comments | « Source/modules/mediastream/MediaConstraintsImpl.h ('k') | Source/modules/mediastream/MediaStreamEvent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698