Upstream version 5.34.104.0

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

diff --git a/src/third_party/WebKit/Source/modules/websockets/WebSocketChannel.cpp b/src/third_party/WebKit/Source/modules/websockets/WebSocketChannel.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 5570ac2..305346a
--- a/src/third_party/WebKit/Source/modules/websockets/WebSocketChannel.cpp
+++ b/src/third_party/WebKit/Source/modules/websockets/WebSocketChannel.cpp
@@ -32,23 +32,22 @@
 
 #include "modules/websockets/WebSocketChannel.h"
 
+#include "RuntimeEnabledFeatures.h"
 #include "bindings/v8/ScriptCallStackFactory.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/inspector/ScriptCallStack.h"
-#include "core/frame/Settings.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerRunLoop.h"
 #include "core/workers/WorkerThread.h"
 #include "modules/websockets/MainThreadWebSocketChannel.h"
+#include "modules/websockets/NewWebSocketChannelImpl.h"
 #include "modules/websockets/ThreadableWebSocketChannelClientWrapper.h"
 #include "modules/websockets/WebSocketChannelClient.h"
 #include "modules/websockets/WorkerThreadableWebSocketChannel.h"
 
 namespace WebCore {
 
-static const char webSocketChannelMode[] = "webSocketChannelMode";
-
 PassRefPtr<WebSocketChannel> WebSocketChannel::create(ExecutionContext* context, WebSocketChannelClient* client)
 {
     ASSERT(context);
@@ -64,16 +63,12 @@ PassRefPtr<WebSocketChannel> WebSocketChannel::create(ExecutionContext* context,
 
     if (context->isWorkerGlobalScope()) {
         WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context);
-        WorkerRunLoop& runLoop = workerGlobalScope->thread()->runLoop();
-        String mode = webSocketChannelMode + String::number(runLoop.createUniqueId());
-        return WorkerThreadableWebSocketChannel::create(workerGlobalScope, client, mode, sourceURL, lineNumber);
+        return WorkerThreadableWebSocketChannel::create(workerGlobalScope, client, sourceURL, lineNumber);
     }
 
     Document* document = toDocument(context);
-    Settings* settings = document->settings();
-    if (settings && settings->experimentalWebSocketEnabled()) {
-        // FIXME: Create and return an "experimental" WebSocketChannel instead of a MainThreadWebSocketChannel.
-        return MainThreadWebSocketChannel::create(document, client, sourceURL, lineNumber);
+    if (RuntimeEnabledFeatures::experimentalWebSocketEnabled()) {
+        return NewWebSocketChannelImpl::create(document, client, sourceURL, lineNumber);
     }
     return MainThreadWebSocketChannel::create(document, client, sourceURL, lineNumber);
 }