Changeset 115649 in webkit

Timestamp:

Apr 30, 2012 10:44:38 AM (12 years ago)

Author:

tommyw@google.com

Message:

MediaStream API: Change LocalMediaStream::stop to be synchronous
​https://bugs.webkit.org/show_bug.cgi?id=84942

Reviewed by Dimitri Glazkov.

Since I changed LocalMediaStream to be a ActiveDOMObject recently the stop()
behaviour needs to change since it is no longer a good idea to start a timer when called.

Not possible to write a test for this.

• Modules/mediastream/LocalMediaStream.cpp:

(WebCore::LocalMediaStream::LocalMediaStream):
(WebCore::LocalMediaStream::stop):

• Modules/mediastream/LocalMediaStream.h:

(LocalMediaStream):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-30  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Change LocalMediaStream::stop to be synchronous
+        https://bugs.webkit.org/show_bug.cgi?id=84942
+
+        Reviewed by Dimitri Glazkov.
+
+        Since I changed LocalMediaStream to be a ActiveDOMObject recently the stop()
+        behaviour needs to change since it is no longer a good idea to start a timer when called.
+
+        Not possible to write a test for this.
+
+        * Modules/mediastream/LocalMediaStream.cpp:
+        (WebCore::LocalMediaStream::LocalMediaStream):
+        (WebCore::LocalMediaStream::stop):
+        * Modules/mediastream/LocalMediaStream.h:
+        (LocalMediaStream):
+
 2012-04-28  Emil A Eklund  <eae@chromium.org> and Levi Weintraub  <leviw@chromium.org>
 

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

@@ -43 +43 @@
 LocalMediaStream::LocalMediaStream(ScriptExecutionContext* context, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
     : MediaStream(context, MediaStreamDescriptor::create(createCanonicalUUIDString(), audioSources, videoSources))
-    , m_stopTimer(this, &LocalMediaStream::stopTimerFired)
 {
 }
@@ -54 +53 @@
 void LocalMediaStream::stop()
 {
-    if (!m_stopTimer.isActive())
-        m_stopTimer.startOneShot(0);
-}
-
-void LocalMediaStream::stopTimerFired(Timer<LocalMediaStream>* timer)
-{
-    ASSERT_UNUSED(timer, timer == &m_stopTimer);
-
     if (readyState() == ENDED)
         return;

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

@@ -30 +30 @@
 
 #include "MediaStream.h"
-#include "Timer.h"
 
 namespace WebCore {
@@ -49 +48 @@
 private:
     LocalMediaStream(ScriptExecutionContext*, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources);
-
-    void stopTimerFired(Timer<LocalMediaStream>*);
-
-    Timer<LocalMediaStream> m_stopTimer;
 };