Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / websockets / DOMWebSocket.cpp

diff --git a/src/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp b/src/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp
index 6f42581..03ceca1 100644 (file)
--- a/src/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp
+++ b/src/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp
@@ -188,7 +188,7 @@ static String encodeSubprotocolString(const String& protocol)
         if (protocol[i] < 0x20 || protocol[i] > 0x7E)
             builder.append(String::format("\\u%04X", protocol[i]));
         else if (protocol[i] == 0x5c)
-            builder.append("\\\\");
+            builder.appendLiteral("\\\\");
         else
             builder.append(protocol[i]);
     }
@@ -235,7 +235,6 @@ DOMWebSocket::DOMWebSocket(ExecutionContext* context)
     , m_eventQueue(EventQueue::create(this))
     , m_bufferedAmountConsumeTimer(this, &DOMWebSocket::reflectBufferedAmountConsumption)
 {
-    ScriptWrappable::init(this);
 }
 
 DOMWebSocket::~DOMWebSocket()