Changeset 250573 in webkit

Timestamp:

Oct 1, 2019, 12:21:07 PM (6 years ago)

Author:

youenn@apple.com

Message:

RTCDataChannel should not prevent entering page cache except if in open state
​https://bugs.webkit.org/show_bug.cgi?id=202395

Reviewed by Chris Dumez.

Only prevent entering page cache in open state.
Enqueue message through the document event queue to handle suspension properly.

We cannot yet write page cache tests as a data channel requires a peer connection which
currently forbids entering page cache.

• Modules/mediastream/RTCDataChannel.cpp:

(WebCore::RTCDataChannel::RTCDataChannel):
(WebCore::RTCDataChannel::didReceiveStringData):
(WebCore::RTCDataChannel::didReceiveRawData):
(WebCore::RTCDataChannel::didDetectError):
(WebCore::RTCDataChannel::bufferedAmountIsDecreasing):
(WebCore::RTCDataChannel::scheduleDispatchEvent):
(WebCore::RTCDataChannel::scheduledEventTimerFired): Deleted.

• Modules/mediastream/RTCDataChannel.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/RTCDataChannel.cpp (modified) (6 diffs)
• Modules/mediastream/RTCDataChannel.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-10-01  youenn fablet  <youenn@apple.com>
+
+        RTCDataChannel should not prevent entering page cache except if in open state
+        https://bugs.webkit.org/show_bug.cgi?id=202395
+
+        Reviewed by Chris Dumez.
+
+        Only prevent entering page cache in open state.
+        Enqueue message through the document event queue to handle suspension properly.
+
+        We cannot yet write page cache tests as a data channel requires a peer connection which
+        currently forbids entering page cache.
+
+        * Modules/mediastream/RTCDataChannel.cpp:
+        (WebCore::RTCDataChannel::RTCDataChannel):
+        (WebCore::RTCDataChannel::didReceiveStringData):
+        (WebCore::RTCDataChannel::didReceiveRawData):
+        (WebCore::RTCDataChannel::didDetectError):
+        (WebCore::RTCDataChannel::bufferedAmountIsDecreasing):
+        (WebCore::RTCDataChannel::scheduleDispatchEvent):
+        (WebCore::RTCDataChannel::scheduledEventTimerFired): Deleted.
+        * Modules/mediastream/RTCDataChannel.h:
+
 2019-10-01  Rob Buis  <rbuis@igalia.com>
 

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

@@ -82 +82 @@
     : ActiveDOMObject(document)
     , m_handler(WTFMove(handler))
-    , m_scheduledEventTimer(*this, &RTCDataChannel::scheduledEventTimerFired)
     , m_label(WTFMove(label))
     , m_options(WTFMove(options))
@@ -195 +194 @@
 void RTCDataChannel::didReceiveStringData(const String& text)
 {
-    if (m_stopped)
-        return;
-
     scheduleDispatchEvent(MessageEvent::create(text));
 }
@@ -203 +199 @@
 void RTCDataChannel::didReceiveRawData(const char* data, size_t dataLength)
 {
-    if (m_stopped)
-        return;
-
     switch (m_binaryType) {
     case BinaryType::Blob:
@@ -219 +212 @@
 void RTCDataChannel::didDetectError()
 {
-    if (m_stopped)
-        return;
-
     scheduleDispatchEvent(Event::create(eventNames().errorEvent, Event::CanBubble::No, Event::IsCancelable::No));
 }
@@ -227 +217 @@
 void RTCDataChannel::bufferedAmountIsDecreasing(size_t amount)
 {
-    if (m_stopped)
-        return;
-
     if (amount <= m_bufferedAmountLowThreshold)
         scheduleDispatchEvent(Event::create(eventNames().bufferedamountlowEvent, Event::CanBubble::No, Event::IsCancelable::No));
@@ -241 +228 @@
 void RTCDataChannel::scheduleDispatchEvent(Ref<Event>&& event)
 {
-    m_scheduledEvents.append(WTFMove(event));
-
-    if (!m_scheduledEventTimer.isActive())
-        m_scheduledEventTimer.startOneShot(0_s);
-}
-
-void RTCDataChannel::scheduledEventTimerFired()
-{
     if (m_stopped)
         return;
 
-    Vector<Ref<Event>> events;
-    events.swap(m_scheduledEvents);
-
-    for (auto& event : events)
-        dispatchEvent(event);
+    event->setTarget(this);
+    scriptExecutionContext()->eventQueue().enqueueEvent(WTFMove(event));
 }
 

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

@@ -85 +85 @@
 
     void scheduleDispatchEvent(Ref<Event>&&);
-    void scheduledEventTimerFired();
 
     EventTargetInterface eventTargetInterface() const final { return RTCDataChannelEventTargetInterfaceType; }
@@ -96 +95 @@
     void stop() final;
     const char* activeDOMObjectName() const final { return "RTCDataChannel"; }
-    bool canSuspendForDocumentSuspension() const final { return m_readyState == RTCDataChannelState::Closed; }
+    bool canSuspendForDocumentSuspension() const final { return m_readyState != RTCDataChannelState::Open; }
 
     // RTCDataChannelHandlerClient API
@@ -114 +113 @@
     BinaryType m_binaryType { BinaryType::ArrayBuffer };
 
-    Timer m_scheduledEventTimer;
-    Vector<Ref<Event>> m_scheduledEvents;
-
     String m_label;
     RTCDataChannelInit m_options;