Changeset 157030 in webkit

Timestamp:

Oct 7, 2013 12:29:09 AM (11 years ago)

Author:

Philippe Normand

Message:

MediaStreamTrack can't be FINAL
​https://bugs.webkit.org/show_bug.cgi?id=122322

Reviewed by Darin Adler.

Marked the MediaStreamTrack subclasses as final.

• Modules/mediastream/AudioStreamTrack.h:
• Modules/mediastream/MediaStreamTrack.h:
• Modules/mediastream/VideoStreamTrack.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/AudioStreamTrack.h (modified) (1 diff)
• Modules/mediastream/MediaStreamTrack.h (modified) (3 diffs)
• Modules/mediastream/VideoStreamTrack.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-04  Philippe Normand  <pnormand@igalia.com>
+
+        MediaStreamTrack can't be FINAL
+        https://bugs.webkit.org/show_bug.cgi?id=122322
+
+        Reviewed by Darin Adler.
+
+        Marked the MediaStreamTrack subclasses as final.
+
+        * Modules/mediastream/AudioStreamTrack.h:
+        * Modules/mediastream/MediaStreamTrack.h:
+        * Modules/mediastream/VideoStreamTrack.h:
+
 2013-10-06  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Source/WebCore/Modules/mediastream/AudioStreamTrack.h

@@ -38 +38 @@
 class ScriptExecutionContext;
 
-class AudioStreamTrack : public MediaStreamTrack {
+class AudioStreamTrack FINAL : public MediaStreamTrack {
 public:
     static PassRefPtr<AudioStreamTrack> create(ScriptExecutionContext*, const Dictionary&);

trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h

@@ -45 +45 @@
 class MediaStreamTrackSourcesCallback;
 
-class MediaStreamTrack FINAL : public RefCounted<MediaStreamTrack>, public ScriptWrappable, public ActiveDOMObject, public EventTargetWithInlineData, public MediaStreamSource::Observer {
+class MediaStreamTrack : public RefCounted<MediaStreamTrack>, public ScriptWrappable, public ActiveDOMObject, public EventTargetWithInlineData, public MediaStreamSource::Observer {
 public:
     virtual ~MediaStreamTrack();
@@ -70 +70 @@
 
     // EventTarget
-    virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return MediaStreamTrackEventTargetInterfaceType; }
-    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ActiveDOMObject::scriptExecutionContext(); }
+    virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return MediaStreamTrackEventTargetInterfaceType; }
+    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return ActiveDOMObject::scriptExecutionContext(); }
 
     // ActiveDOMObject
-    virtual void stop() OVERRIDE;
+    virtual void stop() OVERRIDE FINAL;
 
     using RefCounted<MediaStreamTrack>::ref;
@@ -86 +86 @@
 
     // EventTarget
-    virtual void refEventTarget() OVERRIDE { ref(); }
-    virtual void derefEventTarget() OVERRIDE { deref(); }
+    virtual void refEventTarget() OVERRIDE FINAL { ref(); }
+    virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
 
     // MediaStreamSourceObserver
-    virtual void sourceChangedState() OVERRIDE;
+    virtual void sourceChangedState() OVERRIDE FINAL;
 
     RefPtr<MediaStreamSource> m_source;

trunk/Source/WebCore/Modules/mediastream/VideoStreamTrack.h

@@ -38 +38 @@
 class ScriptExecutionContext;
 
-class VideoStreamTrack : public MediaStreamTrack {
+class VideoStreamTrack FINAL : public MediaStreamTrack {
 public:
     static PassRefPtr<VideoStreamTrack> create(ScriptExecutionContext*, const Dictionary&);