| Index: Source/modules/mediastream/MediaStream.h
|
| diff --git a/Source/modules/mediastream/MediaStream.h b/Source/modules/mediastream/MediaStream.h
|
| index b4e044dfa06b7df1b442c1291a1b488fdb7976a7..6ee0ef6da7517d29f540d2ab3a0be4fdaa5f2c98 100644
|
| --- a/Source/modules/mediastream/MediaStream.h
|
| +++ b/Source/modules/mediastream/MediaStream.h
|
| @@ -51,7 +51,7 @@ public:
|
| static MediaStream* create(ExecutionContext*, MediaStream*);
|
| static MediaStream* create(ExecutionContext*, const MediaStreamTrackVector&);
|
| static MediaStream* create(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
|
| - virtual ~MediaStream();
|
| + ~MediaStream() override;
|
|
|
| // DEPRECATED
|
| String label() const { return m_descriptor->id(); }
|
| @@ -80,16 +80,16 @@ public:
|
| void trackEnded();
|
|
|
| // MediaStreamDescriptorClient
|
| - virtual void streamEnded() override;
|
| + void streamEnded() override;
|
|
|
| MediaStreamDescriptor* descriptor() const { return m_descriptor.get(); }
|
|
|
| // EventTarget
|
| - virtual const AtomicString& interfaceName() const override;
|
| - virtual ExecutionContext* executionContext() const override;
|
| + const AtomicString& interfaceName() const override;
|
| + ExecutionContext* executionContext() const override;
|
|
|
| // URLRegistrable
|
| - virtual URLRegistry& registry() const override;
|
| + URLRegistry& registry() const override;
|
|
|
| // Oilpan: need to eagerly unregister as m_descriptor client.
|
| EAGERLY_FINALIZE();
|
| @@ -100,11 +100,11 @@ private:
|
| MediaStream(ExecutionContext*, const MediaStreamTrackVector& audioTracks, const MediaStreamTrackVector& videoTracks);
|
|
|
| // ContextLifecycleObserver
|
| - virtual void contextDestroyed() override;
|
| + void contextDestroyed() override;
|
|
|
| // MediaStreamDescriptorClient
|
| - virtual void addRemoteTrack(MediaStreamComponent*) override;
|
| - virtual void removeRemoteTrack(MediaStreamComponent*) override;
|
| + void addRemoteTrack(MediaStreamComponent*) override;
|
| + void removeRemoteTrack(MediaStreamComponent*) override;
|
|
|
| bool emptyOrOnlyEndedTracks();
|
|
|
|
|