Changeset 113460 in webkit

Timestamp:

Apr 6, 2012 11:07:10 AM (12 years ago)

Author:

tommyw@google.com

Message:

MediaStream API: MediaStreams stops proper cleanup to take place during a page reload.
​https://bugs.webkit.org/show_bug.cgi?id=83143

Reviewed by Adam Barth.

To fix this I have converted MediaStream and LocalMediaStream to be ActiveDOMObjects.

Have no idea how to write a test that succesfully verifies this. I have done manual testing
to verify that proper tear-down now takes place.

• Modules/mediastream/LocalMediaStream.cpp:

(WebCore::LocalMediaStream::create):
(WebCore::LocalMediaStream::stopFunction):
(WebCore):

• Modules/mediastream/LocalMediaStream.h:

(LocalMediaStream):

• Modules/mediastream/LocalMediaStream.idl:
• Modules/mediastream/MediaStream.cpp:

(WebCore::MediaStream::create):
(WebCore::MediaStream::MediaStream):
(WebCore::MediaStream::scriptExecutionContext):

• Modules/mediastream/MediaStream.h:

(MediaStream):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/LocalMediaStream.cpp (modified) (2 diffs)
• Modules/mediastream/LocalMediaStream.h (modified) (1 diff)
• Modules/mediastream/LocalMediaStream.idl (modified) (1 diff)
• Modules/mediastream/MediaStream.cpp (modified) (2 diffs)
• Modules/mediastream/MediaStream.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-06  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: MediaStreams stops proper cleanup to take place during a page reload.
+        https://bugs.webkit.org/show_bug.cgi?id=83143
+
+        Reviewed by Adam Barth.
+
+        To fix this I have converted MediaStream and LocalMediaStream to be ActiveDOMObjects.
+
+        Have no idea how to write a test that succesfully verifies this. I have done manual testing
+        to verify that proper tear-down now takes place.
+
+        * Modules/mediastream/LocalMediaStream.cpp:
+        (WebCore::LocalMediaStream::create):
+        (WebCore::LocalMediaStream::stopFunction):
+        (WebCore):
+        * Modules/mediastream/LocalMediaStream.h:
+        (LocalMediaStream):
+        * Modules/mediastream/LocalMediaStream.idl:
+        * Modules/mediastream/MediaStream.cpp:
+        (WebCore::MediaStream::create):
+        (WebCore::MediaStream::MediaStream):
+        (WebCore::MediaStream::scriptExecutionContext):
+        * Modules/mediastream/MediaStream.h:
+        (MediaStream):
+
 2012-04-06  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/LocalMediaStream.cpp

@@ -36 +36 @@
 PassRefPtr<LocalMediaStream> LocalMediaStream::create(ScriptExecutionContext* context, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
 {
-    return adoptRef(new LocalMediaStream(context, audioSources, videoSources));
+    RefPtr<LocalMediaStream> stream = adoptRef(new LocalMediaStream(context, audioSources, videoSources));
+    stream->suspendIfNeeded();
+    return stream.release();
 }
 
@@ -43 +45 @@
     , m_stopTimer(this, &LocalMediaStream::stopTimerFired)
 {
+}
+
+void LocalMediaStream::stopFunction()
+{
+    stop();
 }
 

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

@@ -39 +39 @@
     virtual ~LocalMediaStream();
 
-    void stop();
+    void stopFunction();
+
+    // ActiveDOMObject
+    virtual void stop() OVERRIDE;
 
     // EventTarget
-    virtual const AtomicString& interfaceName() const;
+    virtual const AtomicString& interfaceName() const OVERRIDE;
 
 private:

trunk/Source/WebCore/Modules/mediastream/LocalMediaStream.idl

@@ -31 +31 @@
         JSGenerateToJSObject
     ] LocalMediaStream : MediaStream {
-        void stop();
+        [ImplementedAs=stopFunction] void stop();
     };
 

trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp

@@ -77 +77 @@
     RefPtr<MediaStreamDescriptor> descriptor = MediaStreamDescriptor::create(createCanonicalUUIDString(), audioSources, videoSources);
     MediaStreamCenter::instance().didConstructMediaStream(descriptor.get());
-    return adoptRef(new MediaStream(context, descriptor.release()));
+
+    RefPtr<MediaStream> stream = adoptRef(new MediaStream(context, descriptor.release()));
+    stream->suspendIfNeeded();
+    return stream.release();
 }
 
 PassRefPtr<MediaStream> MediaStream::create(ScriptExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor)
 {
-    return adoptRef(new MediaStream(context, streamDescriptor));
+    RefPtr<MediaStream> stream = adoptRef(new MediaStream(context, streamDescriptor));
+    stream->suspendIfNeeded();
+    return stream.release();
 }
 
 MediaStream::MediaStream(ScriptExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor)
-    : m_scriptExecutionContext(context)
+    : ActiveDOMObject(context, this)
     , m_descriptor(streamDescriptor)
 {
@@ -133 +138 @@
 ScriptExecutionContext* MediaStream::scriptExecutionContext() const
 {
-    return m_scriptExecutionContext.get();
+    return ActiveDOMObject::scriptExecutionContext();
 }
 

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

@@ -29 +29 @@
 #if ENABLE(MEDIA_STREAM)
 
+#include "ActiveDOMObject.h"
 #include "EventTarget.h"
 #include "MediaStreamDescriptor.h"
@@ -39 +40 @@
 class ScriptExecutionContext;
 
-class MediaStream : public RefCounted<MediaStream>, public MediaStreamDescriptorOwner, public EventTarget {
+class MediaStream : public RefCounted<MediaStream>, public MediaStreamDescriptorOwner, public EventTarget, public ActiveDOMObject {
 public:
     // Must match the constants in the .idl file.
@@ -64 +65 @@
 
     // EventTarget
-    virtual const AtomicString& interfaceName() const;
-    virtual ScriptExecutionContext* scriptExecutionContext() const;
+    virtual const AtomicString& interfaceName() const OVERRIDE;
+    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE;
 
     using RefCounted<MediaStream>::ref;
@@ -73 +74 @@
     MediaStream(ScriptExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
 
-    // EventTarget implementation.
-    virtual EventTargetData* eventTargetData();
-    virtual EventTargetData* ensureEventTargetData();
+    // EventTarget
+    virtual EventTargetData* eventTargetData() OVERRIDE;
+    virtual EventTargetData* ensureEventTargetData() OVERRIDE;
 
 private:
-    // EventTarget implementation.
-    virtual void refEventTarget() { ref(); }
-    virtual void derefEventTarget() { deref(); }
+    // EventTarget
+    virtual void refEventTarget() OVERRIDE { ref(); }
+    virtual void derefEventTarget() OVERRIDE { deref(); }
 
     EventTargetData m_eventTargetData;
-
-    RefPtr<ScriptExecutionContext> m_scriptExecutionContext;
 
     RefPtr<MediaStreamTrackList> m_audioTracks;