Sync the WebSocket interface with the spec

Source/modules/websockets/DOMWebSocket.cpp

Index: Source/modules/websockets/DOMWebSocket.cpp
diff --git a/Source/modules/websockets/DOMWebSocket.cpp b/Source/modules/websockets/DOMWebSocket.cpp
index f4aab4da8a660febca7aca667f77e2afce799354..abeaf573a56951a24a5c111852e3300b4bb33c0f 100644
--- a/Source/modules/websockets/DOMWebSocket.cpp
+++ b/Source/modules/websockets/DOMWebSocket.cpp
@@ -33,6 +33,7 @@
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptController.h"
+#include "bindings/modules/v8/UnionTypesModules.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMArrayBufferView.h"
 #include "core/dom/Document.h"
@@ -242,11 +243,11 @@ void DOMWebSocket::logError(const String& message)
 
 DOMWebSocket* DOMWebSocket::create(ExecutionContext* context, const String& url, ExceptionState& exceptionState)
 {
-    Vector<String> protocols;
+    StringOrStringSequence protocols;
     return create(context, url, protocols, exceptionState);
 }
 
-DOMWebSocket* DOMWebSocket::create(ExecutionContext* context, const String& url, const Vector<String>& protocols, ExceptionState& exceptionState)
+DOMWebSocket* DOMWebSocket::create(ExecutionContext* context, const String& url, const StringOrStringSequence& protocols, ExceptionState& exceptionState)
 {
     if (url.isNull()) {
         exceptionState.throwDOMException(SyntaxError, "Failed to create a WebSocket: the provided URL is invalid.");
@@ -256,20 +257,24 @@ DOMWebSocket* DOMWebSocket::create(ExecutionContext* context, const String& url,
     DOMWebSocket* webSocket = new DOMWebSocket(context);
     webSocket->suspendIfNeeded();
 
-    webSocket->connect(url, protocols, exceptionState);
+    if (protocols.isNull()) {
+        Vector<String> protocolsVector;
+        webSocket->connect(url, protocolsVector, exceptionState);
+    } else if (protocols.isString()) {
+        Vector<String> protocolsVector;
+        protocolsVector.append(protocols.getAsString());
+        webSocket->connect(url, protocolsVector, exceptionState);
+    } else {
+        ASSERT(protocols.isStringSequence());
+        webSocket->connect(url, protocols.getAsStringSequence(), exceptionState);
+    }
+
     if (exceptionState.hadException())
         return nullptr;
 
     return webSocket;
 }
 
-DOMWebSocket* DOMWebSocket::create(ExecutionContext* context, const String& url, const String& protocol, ExceptionState& exceptionState)
-{
-    Vector<String> protocols;
-    protocols.append(protocol);
-    return create(context, url, protocols, exceptionState);
-}
-
 void DOMWebSocket::connect(const String& url, const Vector<String>& protocols, ExceptionState& exceptionState)
 {
 
@@ -467,7 +472,8 @@ void DOMWebSocket::closeInternal(int code, const String& reason, ExceptionState&
             exceptionState.throwDOMException(InvalidAccessError, "The code must be either 1000, or between 3000 and 4999. " + String::number(code) + " is neither.");
             return;
         }
-        CString utf8 = reason.utf8(StrictUTF8ConversionReplacingUnpairedSurrogatesWithFFFD);
+        // Bindings specify USVString, so unpaired surrogates are already replaced with U+FFFD.

[jsbell, 2015/02/25 18:51:11]

Is this comment helpful here, or just let the bindings (and existing tests)
document this?

[philipj_slow, 2015/02/26 03:02:53]

Someone very familiar with bindings and the distinction between DOMString and
USVString may find this redundant, but it looks good to me. Is there a way to
assert it instead?

Also, have you looked at the generated code to see if it now does
StrictUTF8ConversionReplacingUnpairedSurrogatesWithFFFD? If it's not exactly
equivalent, some test exposing the change in behavior might be nice.

[jsbell, 2015/02/26 05:45:18]

That'd be me (I implemented our USVString handling), fortunately. Or
unfortunately, for getting a second opinion.
I verified that it's covered in:
http/tests/websocket/unpaired-surrogates-in-close-reason.html

.. and the other one in:
http/tests/websocket/unpaired-surrogates-in-message.html

+        CString utf8 = reason.utf8();
         if (utf8.length() > maxReasonSizeInBytes) {
             exceptionState.throwDOMException(SyntaxError, "The message must not be greater than " + String::number(maxReasonSizeInBytes) + " bytes.");
             return;