| Index: third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp
|
| diff --git a/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp b/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp
|
| index 1ed6912aaba4e91e0379bf44331b1fabce238e2d..a70d2eb21fcb1ac375ccade877fa54d22a7f82a7 100644
|
| --- a/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp
|
| +++ b/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp
|
| @@ -313,8 +313,9 @@ void DOMWebSocket::connect(const String& url,
|
| if (!m_url.protocolIs("ws") && !m_url.protocolIs("wss")) {
|
| m_state = kClosed;
|
| exceptionState.throwDOMException(
|
| - SyntaxError, "The URL's scheme must be either 'ws' or 'wss'. '" +
|
| - m_url.protocol() + "' is not allowed.");
|
| + SyntaxError,
|
| + "The URL's scheme must be either 'ws' or 'wss'. '" + m_url.protocol() +
|
| + "' is not allowed.");
|
| return;
|
| }
|
|
|
| @@ -354,9 +355,9 @@ void DOMWebSocket::connect(const String& url,
|
| if (!isValidSubprotocolString(protocols[i])) {
|
| m_state = kClosed;
|
| exceptionState.throwDOMException(
|
| - SyntaxError, "The subprotocol '" +
|
| - encodeSubprotocolString(protocols[i]) +
|
| - "' is invalid.");
|
| + SyntaxError,
|
| + "The subprotocol '" + encodeSubprotocolString(protocols[i]) +
|
| + "' is invalid.");
|
| return;
|
| }
|
| }
|
| @@ -367,9 +368,9 @@ void DOMWebSocket::connect(const String& url,
|
| if (!visited.insert(protocols[i]).isNewEntry) {
|
| m_state = kClosed;
|
| exceptionState.throwDOMException(
|
| - SyntaxError, "The subprotocol '" +
|
| - encodeSubprotocolString(protocols[i]) +
|
| - "' is duplicated.");
|
| + SyntaxError,
|
| + "The subprotocol '" + encodeSubprotocolString(protocols[i]) +
|
| + "' is duplicated.");
|
| return;
|
| }
|
| }
|
| @@ -568,8 +569,9 @@ void DOMWebSocket::closeInternal(int code,
|
| CString utf8 = reason.utf8();
|
| if (utf8.length() > maxReasonSizeInBytes) {
|
| exceptionState.throwDOMException(
|
| - SyntaxError, "The message must not be greater than " +
|
| - String::number(maxReasonSizeInBytes) + " bytes.");
|
| + SyntaxError,
|
| + "The message must not be greater than " +
|
| + String::number(maxReasonSizeInBytes) + " bytes.");
|
| return;
|
| }
|
| if (!reason.isEmpty() && !reason.is8Bit()) {
|
|
|