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

Unified Diff: Source/core/dom/ScriptExecutionContext.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/core/dom/ScriptExecutionContext.h ('k') | Source/core/inspector/InjectedScriptManager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/ScriptExecutionContext.cpp
diff --git a/Source/core/dom/ScriptExecutionContext.cpp b/Source/core/dom/ScriptExecutionContext.cpp
index 78f3874045aaf7be913fd8055c9798826515db21..024b226d272c1eb2c8a4246a129c69e5aa697c35 100644
--- a/Source/core/dom/ScriptExecutionContext.cpp
+++ b/Source/core/dom/ScriptExecutionContext.cpp
@@ -37,7 +37,7 @@
#include "core/inspector/ScriptCallStack.h"
#include "core/loader/cache/CachedScript.h"
#include "core/page/DOMTimer.h"
-#include "core/workers/WorkerContext.h"
+#include "core/workers/WorkerGlobalScope.h"
#include "core/workers/WorkerThread.h"
#include "modules/webdatabase/DatabaseContext.h"
#include "wtf/MainThread.h"
@@ -133,7 +133,7 @@ void ScriptExecutionContext::createdMessagePort(MessagePort* port)
{
ASSERT(port);
ASSERT((isDocument() && isMainThread())
- || (isWorkerContext() && static_cast<WorkerContext*>(this)->thread()->isCurrentThread()));
+ || (isWorkerGlobalScope() && static_cast<WorkerGlobalScope*>(this)->thread()->isCurrentThread()));
m_messagePorts.add(port);
}
@@ -142,7 +142,7 @@ void ScriptExecutionContext::destroyedMessagePort(MessagePort* port)
{
ASSERT(port);
ASSERT((isDocument() && isMainThread())
- || (isWorkerContext() && static_cast<WorkerContext*>(this)->thread()->isCurrentThread()));
+ || (isWorkerGlobalScope() && static_cast<WorkerGlobalScope*>(this)->thread()->isCurrentThread()));
m_messagePorts.remove(port);
}
« no previous file with comments | « Source/core/dom/ScriptExecutionContext.h ('k') | Source/core/inspector/InjectedScriptManager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698