Changeset 134207 in webkit

Timestamp:

Nov 12, 2012 4:24:50 AM (11 years ago)

Author:

tommyw@google.com

Message:

MediaStream API: Schedule the RTCDataChannel events to be triggered at idle state
​https://bugs.webkit.org/show_bug.cgi?id=101751

Reviewed by Adam Barth.

Source/Platform:

Making some WebRTCDataChannel methods const.

• chromium/public/WebRTCDataChannel.h:

(WebRTCDataChannel):

Source/WebCore:

This patch queues the events until the JS interpreter is in an idle state.

Existing tests cover this patch.

• Modules/mediastream/RTCDataChannel.cpp:

(WebCore::RTCDataChannel::RTCDataChannel):
(WebCore::RTCDataChannel::readyStateChanged):
(WebCore::RTCDataChannel::dataArrived):
(WebCore::RTCDataChannel::error):
(WebCore::RTCDataChannel::scheduleDispatchEvent):
(WebCore):
(WebCore::RTCDataChannel::scheduledEventTimerFired):

• Modules/mediastream/RTCDataChannel.h:

(RTCDataChannel):

• platform/chromium/support/WebRTCDataChannel.cpp:

(WebKit::WebRTCDataChannel::setBufferedAmount):
(WebKit::WebRTCDataChannel::readyStateChanged):
(WebKit::WebRTCDataChannel::dataArrived):
(WebKit::WebRTCDataChannel::error):

Tools:

Makes the data channel mocks to be synchronous instead of asynchronous to be able to
properly test RTCDataChannel event handling.

• DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp:

(MockWebRTCPeerConnectionHandler::sendStringData):
(MockWebRTCPeerConnectionHandler::sendRawData):

LayoutTests:

Adding shouldNotTrow to the send() calls.

• fast/mediastream/RTCPeerConnection-datachannel-expected.txt:
• fast/mediastream/RTCPeerConnection-datachannel.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/RTCPeerConnection-datachannel-expected.txt (modified) (1 diff)
• LayoutTests/fast/mediastream/RTCPeerConnection-datachannel.html (modified) (3 diffs)
• Source/Platform/ChangeLog (modified) (1 diff)
• Source/Platform/chromium/public/WebRTCDataChannel.h (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/RTCDataChannel.cpp (modified) (6 diffs)
• Source/WebCore/Modules/mediastream/RTCDataChannel.h (modified) (3 diffs)
• Source/WebCore/platform/chromium/support/WebRTCDataChannel.cpp (modified) (5 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-11-12  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Schedule the RTCDataChannel events to be triggered at idle state
+        https://bugs.webkit.org/show_bug.cgi?id=101751
+
+        Reviewed by Adam Barth.
+
+        Adding shouldNotTrow to the send() calls.
+
+        * fast/mediastream/RTCPeerConnection-datachannel-expected.txt:
+        * fast/mediastream/RTCPeerConnection-datachannel.html:
+
 2012-11-12  Mihnea Ovidenie  <mihnea@adobe.com>
 

trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel-expected.txt

@@ -13 +13 @@
 PASS dc.readyState is 'open'
 PASS dc.label is 'label'
+PASS dc.send('xyzzy'); did not throw exception.
 PASS dc_onmessage_string was called
 PASS data is 'xyzzy'
+PASS dc.send(buffer); did not throw exception.
 PASS dc_onmessage_arraybuffer was called
 PASS data.byteLength is 2
 PASS array[0] is 17
 PASS array[1] is 19
+PASS dc.send(array); did not throw exception.
 PASS dc_onmessage_arraybufferview was called
 PASS data.byteLength is 2

trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel.html

@@ -43 +43 @@
     array[1] = 13;
     dc.onmessage = dc_onmessage_arraybufferview;
-    dc.send(array);
+    shouldNotThrow("dc.send(array);");
 }
 
@@ -52 +52 @@
 
     dc.binaryType = "arraybuffer";
-    var buffer = new ArrayBuffer(2);
+    buffer = new ArrayBuffer(2);
     var array = new Int8Array(buffer);
     array[0] = 17;
     array[1] = 19;
     dc.onmessage = dc_onmessage_arraybuffer;
-    dc.send(buffer);
+    shouldNotThrow("dc.send(buffer);");
 }
 
@@ -66 +66 @@
 
     dc.onmessage = dc_onmessage_string;
-    dc.send("xyzzy");
+    shouldNotThrow("dc.send('xyzzy');");
 }
 

trunk/Source/Platform/ChangeLog

@@ +1 @@
+2012-11-12  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Schedule the RTCDataChannel events to be triggered at idle state
+        https://bugs.webkit.org/show_bug.cgi?id=101751
+
+        Reviewed by Adam Barth.
+
+        Making some WebRTCDataChannel methods const.
+
+        * chromium/public/WebRTCDataChannel.h:
+        (WebRTCDataChannel):
+
 2012-11-09  Tommy Widenflycht  <tommyw@google.com>
 

trunk/Source/Platform/chromium/public/WebRTCDataChannel.h

@@ -70 +70 @@
     WEBKIT_EXPORT bool reliable() const;
 
-    WEBKIT_EXPORT void setBufferedAmount(unsigned long);
-    WEBKIT_EXPORT void readyStateChanged(ReadyState);
-    WEBKIT_EXPORT void dataArrived(const WebString&);
-    WEBKIT_EXPORT void dataArrived(const char*, size_t);
-    WEBKIT_EXPORT void error();
+    WEBKIT_EXPORT void setBufferedAmount(unsigned long) const;
+    WEBKIT_EXPORT void readyStateChanged(ReadyState) const;
+    WEBKIT_EXPORT void dataArrived(const WebString&) const;
+    WEBKIT_EXPORT void dataArrived(const char*, size_t) const;
+    WEBKIT_EXPORT void error() const;
 
     // Extra data associated with this WebRTCDataChannel.

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-12  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Schedule the RTCDataChannel events to be triggered at idle state
+        https://bugs.webkit.org/show_bug.cgi?id=101751
+
+        Reviewed by Adam Barth.
+
+        This patch queues the events until the JS interpreter is in an idle state.
+
+        Existing tests cover this patch.
+
+        * Modules/mediastream/RTCDataChannel.cpp:
+        (WebCore::RTCDataChannel::RTCDataChannel):
+        (WebCore::RTCDataChannel::readyStateChanged):
+        (WebCore::RTCDataChannel::dataArrived):
+        (WebCore::RTCDataChannel::error):
+        (WebCore::RTCDataChannel::scheduleDispatchEvent):
+        (WebCore):
+        (WebCore::RTCDataChannel::scheduledEventTimerFired):
+        * Modules/mediastream/RTCDataChannel.h:
+        (RTCDataChannel):
+        * platform/chromium/support/WebRTCDataChannel.cpp:
+        (WebKit::WebRTCDataChannel::setBufferedAmount):
+        (WebKit::WebRTCDataChannel::readyStateChanged):
+        (WebKit::WebRTCDataChannel::dataArrived):
+        (WebKit::WebRTCDataChannel::error):
+
 2012-11-12  Kunihiko Sakamoto  <ksakamoto@chromium.org>
 

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

@@ -64 +64 @@
     , m_binaryType(BinaryTypeArrayBuffer)
     , m_handler(handler)
+    , m_scheduledEventTimer(this, &RTCDataChannel::scheduledEventTimerFired)
 {
     m_descriptor->setClient(this);
@@ -187 +188 @@
     switch (m_descriptor->readyState()) {
     case RTCDataChannelDescriptor::ReadyStateOpen:
-        dispatchEvent(Event::create(eventNames().openEvent, false, false));
+        scheduleDispatchEvent(Event::create(eventNames().openEvent, false, false));
         break;
     case RTCDataChannelDescriptor::ReadyStateClosed:
-        dispatchEvent(Event::create(eventNames().closeEvent, false, false));
+        scheduleDispatchEvent(Event::create(eventNames().closeEvent, false, false));
         break;
     default:
@@ -202 +203 @@
         return;
 
-    dispatchEvent(MessageEvent::create(text));
+    scheduleDispatchEvent(MessageEvent::create(text));
 }
 
@@ -216 +217 @@
     if (m_binaryType == BinaryTypeArrayBuffer) {
         RefPtr<ArrayBuffer> buffer = ArrayBuffer::create(data, dataLength);
-        dispatchEvent(MessageEvent::create(buffer.release()));
+        scheduleDispatchEvent(MessageEvent::create(buffer.release()));
         return;
     }
@@ -227 +228 @@
         return;
 
-    dispatchEvent(Event::create(eventNames().errorEvent, false, false));
+    scheduleDispatchEvent(Event::create(eventNames().errorEvent, false, false));
 }
 
@@ -263 +264 @@
 }
 
+void RTCDataChannel::scheduleDispatchEvent(PassRefPtr<Event> event)
+{
+    m_scheduledEvents.append(event);
+
+    if (!m_scheduledEventTimer.isActive())
+        m_scheduledEventTimer.startOneShot(0);
+}
+
+void RTCDataChannel::scheduledEventTimerFired(Timer<RTCDataChannel>*)
+{
+    if (m_stopped)
+        return;
+
+    Vector<RefPtr<Event> > events;
+    events.swap(m_scheduledEvents);
+
+    Vector<RefPtr<Event> >::iterator it = events.begin();
+    for (; it != events.end(); ++it)
+        dispatchEvent((*it).release());
+
+    events.clear();
+}
+
 } // namespace WebCore
 

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

@@ -31 +31 @@
 #include "EventTarget.h"
 #include "RTCDataChannelDescriptor.h"
+#include "Timer.h"
 #include <wtf/RefCounted.h>
 
@@ -79 +80 @@
     RTCDataChannel(ScriptExecutionContext*, RTCPeerConnectionHandler*, PassRefPtr<RTCDataChannelDescriptor>);
 
+    void scheduleDispatchEvent(PassRefPtr<Event>);
+    void scheduledEventTimerFired(Timer<RTCDataChannel>*);
+
     // EventTarget
     virtual EventTargetData* eventTargetData();
@@ -104 +108 @@
     // Not owned by this class.
     RTCPeerConnectionHandler* m_handler;
+
+    Timer<RTCDataChannel> m_scheduledEventTimer;
+    Vector<RefPtr<Event> > m_scheduledEvents;
 };
 

trunk/Source/WebCore/platform/chromium/support/WebRTCDataChannel.cpp

@@ -107 +107 @@
 }
 
-void WebRTCDataChannel::setBufferedAmount(unsigned long bufferedAmount)
+void WebRTCDataChannel::setBufferedAmount(unsigned long bufferedAmount) const
 {
     ASSERT(!isNull());
@@ -113 +113 @@
 }
 
-void WebRTCDataChannel::readyStateChanged(ReadyState state)
+void WebRTCDataChannel::readyStateChanged(ReadyState state) const
 {
     ASSERT(!isNull());
@@ -119 +119 @@
 }
 
-void WebRTCDataChannel::dataArrived(const WebString& data)
+void WebRTCDataChannel::dataArrived(const WebString& data) const
 {
     ASSERT(!isNull());
@@ -125 +125 @@
 }
 
-void WebRTCDataChannel::dataArrived(const char* data, size_t dataLength)
+void WebRTCDataChannel::dataArrived(const char* data, size_t dataLength) const
 {
     ASSERT(!isNull());
@@ -131 +131 @@
 }
 
-void WebRTCDataChannel::error()
+void WebRTCDataChannel::error() const
 {
     ASSERT(!isNull());

trunk/Tools/ChangeLog

@@ +1 @@
+2012-11-12  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Schedule the RTCDataChannel events to be triggered at idle state
+        https://bugs.webkit.org/show_bug.cgi?id=101751
+
+        Reviewed by Adam Barth.
+
+        Makes the data channel mocks to be synchronous instead of asynchronous to be able to
+        properly test RTCDataChannel event handling.
+
+        * DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp:
+        (MockWebRTCPeerConnectionHandler::sendStringData):
+        (MockWebRTCPeerConnectionHandler::sendRawData):
+
 2012-11-12  Jochen Eisinger  <jochen@chromium.org>
 

trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp

@@ -352 +352 @@
         return false;
 
-    postTask(new StringDataTask(this, dataChannel, data));
+    dataChannel.dataArrived(data);
     return true;
 }
@@ -361 +361 @@
         return false;
 
-    postTask(new CharPtrDataTask(this, dataChannel, data, length));
+    dataChannel.dataArrived(data, length);
     return true;
 }