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

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

Issue 635233004: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/modules (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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) 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 "platform/mediastream/MediaStreamSource.h" 33 #include "platform/mediastream/MediaStreamSource.h"
34 #include "wtf/Forward.h" 34 #include "wtf/Forward.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 class AudioSourceProvider; 38 class AudioSourceProvider;
39 class ExceptionState; 39 class ExceptionState;
40 class MediaStreamComponent; 40 class MediaStreamComponent;
41 class MediaStreamTrackSourcesCallback; 41 class MediaStreamTrackSourcesCallback;
42 42
43 class MediaStreamTrack FINAL 43 class MediaStreamTrack final
44 : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<MediaStre amTrack> 44 : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<MediaStre amTrack>
45 , public ActiveDOMObject 45 , public ActiveDOMObject
46 , public EventTargetWithInlineData 46 , public EventTargetWithInlineData
47 , public MediaStreamSource::Observer { 47 , public MediaStreamSource::Observer {
48 DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollectedWi llBeGarbageCollectedFinalized<MediaStreamTrack>); 48 DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollectedWi llBeGarbageCollectedFinalized<MediaStreamTrack>);
49 DEFINE_WRAPPERTYPEINFO(); 49 DEFINE_WRAPPERTYPEINFO();
50 USING_GARBAGE_COLLECTED_MIXIN(MediaStreamTrack); 50 USING_GARBAGE_COLLECTED_MIXIN(MediaStreamTrack);
51 public: 51 public:
52 static MediaStreamTrack* create(ExecutionContext*, MediaStreamComponent*); 52 static MediaStreamTrack* create(ExecutionContext*, MediaStreamComponent*);
53 virtual ~MediaStreamTrack(); 53 virtual ~MediaStreamTrack();
(...skipping 17 matching lines...) Expand all
71 DEFINE_ATTRIBUTE_EVENT_LISTENER(unmute); 71 DEFINE_ATTRIBUTE_EVENT_LISTENER(unmute);
72 DEFINE_ATTRIBUTE_EVENT_LISTENER(ended); 72 DEFINE_ATTRIBUTE_EVENT_LISTENER(ended);
73 73
74 MediaStreamComponent* component(); 74 MediaStreamComponent* component();
75 bool ended() const; 75 bool ended() const;
76 76
77 void registerMediaStream(MediaStream*); 77 void registerMediaStream(MediaStream*);
78 void unregisterMediaStream(MediaStream*); 78 void unregisterMediaStream(MediaStream*);
79 79
80 // EventTarget 80 // EventTarget
81 virtual const AtomicString& interfaceName() const OVERRIDE; 81 virtual const AtomicString& interfaceName() const override;
82 virtual ExecutionContext* executionContext() const OVERRIDE; 82 virtual ExecutionContext* executionContext() const override;
83 83
84 // ActiveDOMObject 84 // ActiveDOMObject
85 virtual void stop() OVERRIDE; 85 virtual void stop() override;
86 86
87 PassOwnPtr<AudioSourceProvider> createWebAudioSource(); 87 PassOwnPtr<AudioSourceProvider> createWebAudioSource();
88 88
89 virtual void trace(Visitor*) OVERRIDE; 89 virtual void trace(Visitor*) override;
90 90
91 private: 91 private:
92 MediaStreamTrack(ExecutionContext*, MediaStreamComponent*); 92 MediaStreamTrack(ExecutionContext*, MediaStreamComponent*);
93 93
94 // MediaStreamSourceObserver 94 // MediaStreamSourceObserver
95 virtual void sourceChangedState() OVERRIDE; 95 virtual void sourceChangedState() override;
96 96
97 void propagateTrackEnded(); 97 void propagateTrackEnded();
98 98
99 MediaStreamSource::ReadyState m_readyState; 99 MediaStreamSource::ReadyState m_readyState;
100 HeapHashSet<Member<MediaStream> > m_registeredMediaStreams; 100 HeapHashSet<Member<MediaStream> > m_registeredMediaStreams;
101 bool m_isIteratingRegisteredMediaStreams; 101 bool m_isIteratingRegisteredMediaStreams;
102 bool m_stopped; 102 bool m_stopped;
103 Member<MediaStreamComponent> m_component; 103 Member<MediaStreamComponent> m_component;
104 }; 104 };
105 105
106 typedef HeapVector<Member<MediaStreamTrack> > MediaStreamTrackVector; 106 typedef HeapVector<Member<MediaStreamTrack> > MediaStreamTrackVector;
107 107
108 } // namespace blink 108 } // namespace blink
109 109
110 #endif // MediaStreamTrack_h 110 #endif // MediaStreamTrack_h
OLDNEW
« no previous file with comments | « Source/modules/mediastream/MediaStreamRegistry.h ('k') | Source/modules/mediastream/MediaStreamTrackEvent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698