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

Unified Diff: Source/web/WebSharedWorkerImpl.cpp

Issue 1115923002: workers: Rename WorkerThread to WorkerScript. Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: . Created 5 years, 7 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
Index: Source/web/WebSharedWorkerImpl.cpp
diff --git a/Source/web/WebSharedWorkerImpl.cpp b/Source/web/WebSharedWorkerImpl.cpp
index a3e270508c21cffab6c5c8387a1222b2423bb9dc..6cbcf5ce13c648d35e5a36527bf4ac1699285e66 100644
--- a/Source/web/WebSharedWorkerImpl.cpp
+++ b/Source/web/WebSharedWorkerImpl.cpp
@@ -49,7 +49,7 @@
#include "core/workers/WorkerInspectorProxy.h"
#include "core/workers/WorkerLoaderProxy.h"
#include "core/workers/WorkerScriptLoader.h"
-#include "core/workers/WorkerThreadStartupData.h"
+#include "core/workers/WorkerScriptStartupData.h"
#include "platform/RuntimeEnabledFeatures.h"
#include "platform/ThreadSafeFunctional.h"
#include "platform/heap/Handle.h"
@@ -191,9 +191,9 @@ void WebSharedWorkerImpl::stopWorkerThread()
delete this;
return;
}
- if (m_workerThread)
- m_workerThread->stop();
- m_workerInspectorProxy->workerThreadTerminated();
+ if (m_workerScript)
+ m_workerScript->stop();
+ m_workerInspectorProxy->workerScriptTerminated();
}
void WebSharedWorkerImpl::initializeLoader()
@@ -327,12 +327,12 @@ void WebSharedWorkerImpl::workerGlobalScopeStarted(WorkerGlobalScope*)
{
}
-void WebSharedWorkerImpl::workerThreadTerminated()
+void WebSharedWorkerImpl::workerScriptTerminated()
{
- Platform::current()->mainThread()->postTask(FROM_HERE, threadSafeBind(&WebSharedWorkerImpl::workerThreadTerminatedOnMainThread, AllowCrossThreadAccess(this)));
+ Platform::current()->mainThread()->postTask(FROM_HERE, threadSafeBind(&WebSharedWorkerImpl::workerScriptTerminatedOnMainThread, AllowCrossThreadAccess(this)));
}
-void WebSharedWorkerImpl::workerThreadTerminatedOnMainThread()
+void WebSharedWorkerImpl::workerScriptTerminatedOnMainThread()
{
if (client())
client()->workerContextDestroyed();
@@ -349,13 +349,13 @@ void WebSharedWorkerImpl::postTaskToLoader(PassOwnPtr<ExecutionContextTask> task
bool WebSharedWorkerImpl::postTaskToWorkerGlobalScope(PassOwnPtr<ExecutionContextTask> task)
{
- m_workerThread->postTask(FROM_HERE, task);
+ m_workerScript->postTask(FROM_HERE, task);
return true;
}
void WebSharedWorkerImpl::connect(WebMessagePortChannel* webChannel)
{
- workerThread()->postTask(
+ workerScript()->postTask(
FROM_HERE, createCrossThreadTask(&connectTask, adoptPtr(webChannel)));
}
@@ -414,14 +414,14 @@ void WebSharedWorkerImpl::onScriptLoaderFinished()
provideLocalFileSystemToWorker(workerClients.get(), LocalFileSystemClient::create());
WebSecurityOrigin webSecurityOrigin(m_loadingDocument->securityOrigin());
provideContentSettingsClientToWorker(workerClients.get(), adoptPtr(client()->createWorkerContentSettingsClientProxy(webSecurityOrigin)));
- OwnPtr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::create(m_url, m_loadingDocument->userAgent(m_url), m_mainScriptLoader->script(), nullptr, startMode, m_contentSecurityPolicy, static_cast<ContentSecurityPolicyHeaderType>(m_policyType), starterOrigin, workerClients.release());
+ OwnPtr<WorkerScriptStartupData> startupData = WorkerScriptStartupData::create(m_url, m_loadingDocument->userAgent(m_url), m_mainScriptLoader->script(), nullptr, startMode, m_contentSecurityPolicy, static_cast<ContentSecurityPolicyHeaderType>(m_policyType), starterOrigin, workerClients.release());
m_loaderProxy = WorkerLoaderProxy::create(this);
setWorkerThread(SharedWorkerThread::create(m_name, m_loaderProxy, *this, startupData.release()));
InspectorInstrumentation::scriptImported(m_loadingDocument.get(), m_mainScriptLoader->identifier(), m_mainScriptLoader->script());
m_mainScriptLoader.clear();
- workerThread()->start();
- m_workerInspectorProxy->workerThreadCreated(m_loadingDocument.get(), workerThread(), m_url);
+ workerScript()->start();
+ m_workerInspectorProxy->workerScriptCreated(m_loadingDocument.get(), workerScript(), m_url);
if (client())
client()->workerScriptLoaded();
}

Powered by Google App Engine
This is Rietveld 408576698