Title: [263012] trunk
Revision
263012
Author
[email protected]
Date
2020-06-14 11:57:23 -0700 (Sun, 14 Jun 2020)

Log Message

[WPT] websockets/Close-reason-unpaired-surrogates.any.html fails due to failure to convert unpaired surrogates to replacement character for close reason
https://bugs.webkit.org/show_bug.cgi?id=213182

Reviewed by Darin Adler.

LayoutTests/imported/w3c:

* web-platform-tests/websockets/Close-reason-unpaired-surrogates.any-expected.txt:
* web-platform-tests/websockets/Close-reason-unpaired-surrogates.any.worker-expected.txt:
* web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any-expected.txt: Added.
* web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any.worker-expected.txt: Added.
Update/add results now that these tests pass.

Source/WebCore:

Now passing the following tests:
    imported/w3c/web-platform-tests/websockets/Close-reason-unpaired-surrogates.any.html
    imported/w3c/web-platform-tests/websockets/Close-reason-unpaired-surrogates.any.worker.html
    imported/w3c/web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any.html
    imported/w3c/web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any.worker.html

* Modules/websockets/WebSocket.idl:
Match spec (https://html.spec.whatwg.org/multipage/web-sockets.html#the-websocket-interface)
by making the reason argument in close() a USVString rather than a DOMString. This causes
all unpaired surrogates to be replaced with \uFFFD, the replacement character.

LayoutTests:

* TestExpectations:
Unskips the following tests which now pass all the time:
    imported/w3c/web-platform-tests/websockets/Close-reason-unpaired-surrogates.any.worker.html
    imported/w3c/web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any.html
    imported/w3c/web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any.worker.html

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (263011 => 263012)


--- trunk/LayoutTests/ChangeLog	2020-06-14 18:55:15 UTC (rev 263011)
+++ trunk/LayoutTests/ChangeLog	2020-06-14 18:57:23 UTC (rev 263012)
@@ -1,3 +1,17 @@
+2020-06-14  Sam Weinig  <[email protected]>
+
+        [WPT] websockets/Close-reason-unpaired-surrogates.any.html fails due to failure to convert unpaired surrogates to replacement character for close reason
+        https://bugs.webkit.org/show_bug.cgi?id=213182
+
+        Reviewed by Darin Adler.
+
+        * TestExpectations: 
+        Unskips the following tests which now pass all the time:
+            imported/w3c/web-platform-tests/websockets/Close-reason-unpaired-surrogates.any.worker.html
+            imported/w3c/web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any.html
+            imported/w3c/web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any.worker.html
+        
+
 2020-06-13  Zalan Bujtas  <[email protected]>
 
         [LFC][Floats] Floating positioned box is always a float avoider.

Modified: trunk/LayoutTests/TestExpectations (263011 => 263012)


--- trunk/LayoutTests/TestExpectations	2020-06-14 18:55:15 UTC (rev 263011)
+++ trunk/LayoutTests/TestExpectations	2020-06-14 18:57:23 UTC (rev 263012)
@@ -2944,7 +2944,6 @@
 imported/w3c/web-platform-tests/websockets/Send-Unpaired-Surrogates.any.worker.html [ Skip ]
 imported/w3c/web-platform-tests/websockets/interfaces/WebSocket/close/close-connecting.html [ Pass Failure ]
 imported/w3c/web-platform-tests/websockets/interfaces/WebSocket/close/close-basic.html [ Pass Failure ]
-imported/w3c/web-platform-tests/websockets/Close-reason-unpaired-surrogates.any.worker.html [ Pass Failure ]
 imported/w3c/web-platform-tests/websockets/Close-undefined.any.html [ Pass Failure ]
 imported/w3c/web-platform-tests/websockets/interfaces/WebSocket/readyState/006.html [ Pass Failure ]
 imported/w3c/web-platform-tests/websockets/interfaces/WebSocket/events/015.html [ Pass Failure ]
@@ -2962,7 +2961,6 @@
 imported/w3c/web-platform-tests/websockets/Create-Secure-valid-url-protocol-string.any.html [ Skip ]
 imported/w3c/web-platform-tests/websockets/Secure-Send-65K-data.any.worker.html [ Skip ]
 imported/w3c/web-platform-tests/websockets/Secure-Close-1005.any.worker.html [ Skip ]
-imported/w3c/web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any.html [ Skip ]
 imported/w3c/web-platform-tests/websockets/Create-on-worker-shutdown.any.html [ Skip ]
 imported/w3c/web-platform-tests/websockets/Secure-Close-server-initiated-close.any.html [ Skip ]
 imported/w3c/web-platform-tests/websockets/Secure-Send-binary-arraybuffer.any.worker.html [ Skip ]
@@ -3011,7 +3009,6 @@
 imported/w3c/web-platform-tests/websockets/Secure-Send-binary-65K-arraybuffer.any.worker.html [ Skip ]
 imported/w3c/web-platform-tests/websockets/Secure-Close-1000-reason.any.html [ Skip ]
 imported/w3c/web-platform-tests/websockets/Create-Secure-valid-url-array-protocols.any.worker.html [ Skip ]
-imported/w3c/web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any.worker.html [ Skip ]
 imported/w3c/web-platform-tests/websockets/Secure-Send-binary-65K-arraybuffer.any.html [ Skip ]
 imported/w3c/web-platform-tests/websockets/Secure-Close-readyState-Closed.any.html [ Skip ]
 imported/w3c/web-platform-tests/websockets/Create-Secure-valid-url.any.worker.html [ Skip ]

Modified: trunk/LayoutTests/imported/w3c/ChangeLog (263011 => 263012)


--- trunk/LayoutTests/imported/w3c/ChangeLog	2020-06-14 18:55:15 UTC (rev 263011)
+++ trunk/LayoutTests/imported/w3c/ChangeLog	2020-06-14 18:57:23 UTC (rev 263012)
@@ -1,3 +1,16 @@
+2020-06-14  Sam Weinig  <[email protected]>
+
+        [WPT] websockets/Close-reason-unpaired-surrogates.any.html fails due to failure to convert unpaired surrogates to replacement character for close reason
+        https://bugs.webkit.org/show_bug.cgi?id=213182
+
+        Reviewed by Darin Adler.
+
+        * web-platform-tests/websockets/Close-reason-unpaired-surrogates.any-expected.txt:
+        * web-platform-tests/websockets/Close-reason-unpaired-surrogates.any.worker-expected.txt:
+        * web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any-expected.txt: Added.
+        * web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any.worker-expected.txt: Added.
+        Update/add results now that these tests pass. 
+
 2020-06-14  Tetsuharu Ohzeki  <[email protected]>
 
         Withdraw FileReaderSync from ServiceWorker

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/websockets/Close-reason-unpaired-surrogates.any-expected.txt (263011 => 263012)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/websockets/Close-reason-unpaired-surrogates.any-expected.txt	2020-06-14 18:55:15 UTC (rev 263011)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/websockets/Close-reason-unpaired-surrogates.any-expected.txt	2020-06-14 18:57:23 UTC (rev 263012)
@@ -1,4 +1,4 @@
 
 PASS Create WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get opened 
-FAIL Create WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get closed assert_equals: reason replaced with replacement character expected "\ufffd" but got ""
+PASS Create WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get closed 
 

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/websockets/Close-reason-unpaired-surrogates.any.worker-expected.txt (263011 => 263012)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/websockets/Close-reason-unpaired-surrogates.any.worker-expected.txt	2020-06-14 18:55:15 UTC (rev 263011)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/websockets/Close-reason-unpaired-surrogates.any.worker-expected.txt	2020-06-14 18:57:23 UTC (rev 263012)
@@ -1,4 +1,4 @@
 
 PASS Create WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get opened 
-FAIL Create WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get closed assert_equals: reason replaced with replacement character expected "\ufffd" but got ""
+PASS Create WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get closed 
 

Added: trunk/LayoutTests/imported/w3c/web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any-expected.txt (0 => 263012)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any-expected.txt	2020-06-14 18:57:23 UTC (rev 263012)
@@ -0,0 +1,4 @@
+
+PASS Create Secure WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get opened 
+PASS Create Secure WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get closed 
+

Added: trunk/LayoutTests/imported/w3c/web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any.worker-expected.txt (0 => 263012)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any.worker-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any.worker-expected.txt	2020-06-14 18:57:23 UTC (rev 263012)
@@ -0,0 +1,4 @@
+
+PASS Create Secure WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get opened 
+PASS Create Secure WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get closed 
+

Modified: trunk/Source/WebCore/ChangeLog (263011 => 263012)


--- trunk/Source/WebCore/ChangeLog	2020-06-14 18:55:15 UTC (rev 263011)
+++ trunk/Source/WebCore/ChangeLog	2020-06-14 18:57:23 UTC (rev 263012)
@@ -1,3 +1,21 @@
+2020-06-14  Sam Weinig  <[email protected]>
+
+        [WPT] websockets/Close-reason-unpaired-surrogates.any.html fails due to failure to convert unpaired surrogates to replacement character for close reason
+        https://bugs.webkit.org/show_bug.cgi?id=213182
+
+        Reviewed by Darin Adler.
+
+        Now passing the following tests:
+            imported/w3c/web-platform-tests/websockets/Close-reason-unpaired-surrogates.any.html
+            imported/w3c/web-platform-tests/websockets/Close-reason-unpaired-surrogates.any.worker.html
+            imported/w3c/web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any.html
+            imported/w3c/web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any.worker.html
+
+        * Modules/websockets/WebSocket.idl:
+        Match spec (https://html.spec.whatwg.org/multipage/web-sockets.html#the-websocket-interface)
+        by making the reason argument in close() a USVString rather than a DOMString. This causes 
+        all unpaired surrogates to be replaced with \uFFFD, the replacement character.
+
 2020-06-14  Tetsuharu Ohzeki  <[email protected]>
 
         Withdraw FileReaderSync from ServiceWorker

Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.idl (263011 => 263012)


--- trunk/Source/WebCore/Modules/websockets/WebSocket.idl	2020-06-14 18:55:15 UTC (rev 263011)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.idl	2020-06-14 18:57:23 UTC (rev 263012)
@@ -64,5 +64,5 @@
     [MayThrowException] void send(Blob data);
     [MayThrowException] void send(USVString data);
 
-    [MayThrowException] void close(optional [Clamp] unsigned short code, optional DOMString reason);
+    [MayThrowException] void close(optional [Clamp] unsigned short code, optional USVString reason);
 };
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to