Changeset 278842 in webkit

Timestamp:

Jun 14, 2021, 11:40:54 AM (5 years ago)

Author:

youenn@apple.com

Message:

Fix RTCDataChannelInit::decode
​https://bugs.webkit.org/show_bug.cgi?id=226968

Reviewed by Eric Carlson.

LayoutTests/imported/w3c:

• web-platform-tests/webrtc-extensions/transfer-datachannel-service-worker.https-expected.txt: Added.
• web-platform-tests/webrtc-extensions/transfer-datachannel-service-worker.https.html: Added.
• web-platform-tests/webrtc-extensions/transfer-datachannel-service-worker.js: Added.

(onmessage):

Source/WebCore:

Test: imported/w3c/web-platform-tests/webrtc-extensions/transfer-datachannel-service-worker.https.html

• platform/mediastream/RTCDataChannelHandler.h:

(WebCore::RTCDataChannelInit::decode):
Make sure to use optionals of optionals.

LayoutTests:

• platform/mac-wk1/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/webrtc-extensions/transfer-datachannel-service-worker.https-expected.txt (added)
• LayoutTests/imported/w3c/web-platform-tests/webrtc-extensions/transfer-datachannel-service-worker.https.html (added)
• LayoutTests/imported/w3c/web-platform-tests/webrtc-extensions/transfer-datachannel-service-worker.js (added)
• LayoutTests/platform/mac-wk1/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/mediastream/RTCDataChannelHandler.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-06-14  Youenn Fablet  <youenn@apple.com>
+
+        Fix RTCDataChannelInit::decode
+        https://bugs.webkit.org/show_bug.cgi?id=226968
+
+        Reviewed by Eric Carlson.
+
+        * platform/mac-wk1/TestExpectations:
+
 2021-06-14  Robert Jenner  <jenner@apple.com>
 

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-06-14  Youenn Fablet  <youenn@apple.com>
+
+        Fix RTCDataChannelInit::decode
+        https://bugs.webkit.org/show_bug.cgi?id=226968
+
+        Reviewed by Eric Carlson.
+
+        * web-platform-tests/webrtc-extensions/transfer-datachannel-service-worker.https-expected.txt: Added.
+        * web-platform-tests/webrtc-extensions/transfer-datachannel-service-worker.https.html: Added.
+        * web-platform-tests/webrtc-extensions/transfer-datachannel-service-worker.js: Added.
+        (onmessage):
+
 2021-06-14  Youenn Fablet  <youenn@apple.com>
 

trunk/LayoutTests/platform/mac-wk1/TestExpectations

@@ -377 +377 @@
 imported/w3c/web-platform-tests/worklets/layout-worklet-service-worker-interception.https.html [ Skip ]
 imported/w3c/web-platform-tests/worklets/paint-worklet-service-worker-interception.https.html [ Skip ]
+imported/w3c/web-platform-tests/webrtc-extensions/transfer-datachannel-service-worker.https.html [ Skip ]
 
 # Quota check missing in WK1

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-14  Youenn Fablet  <youenn@apple.com>
+
+        Fix RTCDataChannelInit::decode
+        https://bugs.webkit.org/show_bug.cgi?id=226968
+
+        Reviewed by Eric Carlson.
+
+        Test: imported/w3c/web-platform-tests/webrtc-extensions/transfer-datachannel-service-worker.https.html
+
+        * platform/mediastream/RTCDataChannelHandler.h:
+        (WebCore::RTCDataChannelInit::decode):
+        Make sure to use optionals of optionals.
+
 2021-06-14  Per Arne  <pvollan@apple.com>
 

trunk/Source/WebCore/platform/mediastream/RTCDataChannelHandler.h

@@ -63 +63 @@
 template<class Decoder> std::optional<RTCDataChannelInit> RTCDataChannelInit::decode(Decoder& decoder)
 {
-    std::optional<bool> ordered;
+    std::optional<std::optional<bool>> ordered;
     decoder >> ordered;
     if (!ordered)
         return { };
 
-    std::optional<unsigned short> maxPacketLifeTime;
+    std::optional<std::optional<unsigned short>> maxPacketLifeTime;
     decoder >> maxPacketLifeTime;
     if (!maxPacketLifeTime)
         return { };
 
-    std::optional<unsigned short> maxRetransmits;
+    std::optional<std::optional<unsigned short>> maxRetransmits;
     decoder >> maxRetransmits;
     if (!maxRetransmits)
@@ -82 +82 @@
         return { };
 
-    std::optional<bool> negotiated;
+    std::optional<std::optional<bool>> negotiated;
     decoder >> negotiated;
     if (!negotiated)
         return { };
 
-    std::optional<unsigned short> id;
+    std::optional<std::optional<unsigned short>> id;
     decoder >> id;
     if (!id)