Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1550)

Unified Diff: Source/modules/websockets/WebSocketChannel.cpp

Issue 17648006: Rename WorkerContext to WorkerGlobalScope (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/websockets/WebSocket.idl ('k') | Source/modules/websockets/WorkerContextWebSocket.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/websockets/WebSocketChannel.cpp
diff --git a/Source/modules/websockets/WebSocketChannel.cpp b/Source/modules/websockets/WebSocketChannel.cpp
index f7d8b1a18043ee1f1ee1bd534df4fc00b901242d..daccf5ef515918ae90b7bee94a9effb004e4719b 100644
--- a/Source/modules/websockets/WebSocketChannel.cpp
+++ b/Source/modules/websockets/WebSocketChannel.cpp
@@ -35,7 +35,7 @@
#include "core/dom/Document.h"
#include "core/dom/ScriptExecutionContext.h"
#include "core/page/Settings.h"
-#include "core/workers/WorkerContext.h"
+#include "core/workers/WorkerGlobalScope.h"
#include "core/workers/WorkerRunLoop.h"
#include "core/workers/WorkerThread.h"
#include "modules/websockets/MainThreadWebSocketChannel.h"
@@ -54,12 +54,12 @@ PassRefPtr<WebSocketChannel> WebSocketChannel::create(ScriptExecutionContext* co
ASSERT(context);
ASSERT(client);
- if (context->isWorkerContext()) {
- WorkerContext* workerContext = static_cast<WorkerContext*>(context);
- WorkerRunLoop& runLoop = workerContext->thread()->runLoop();
+ if (context->isWorkerGlobalScope()) {
+ WorkerGlobalScope* workerGlobalScope = static_cast<WorkerGlobalScope*>(context);
+ WorkerRunLoop& runLoop = workerGlobalScope->thread()->runLoop();
String mode = webSocketChannelMode;
mode.append(String::number(runLoop.createUniqueId()));
- return WorkerThreadableWebSocketChannel::create(workerContext, client, mode);
+ return WorkerThreadableWebSocketChannel::create(workerGlobalScope, client, mode);
}
Document* document = toDocument(context);
« no previous file with comments | « Source/modules/websockets/WebSocket.idl ('k') | Source/modules/websockets/WorkerContextWebSocket.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698