Rename WorkerThread to WorkerScript

third_party/WebKit/Source/core/loader/WorkerThreadableLoader.cpp

 /*
  * Copyright (C) 2009, 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 18 matching lines @@
  */
 
 #include "core/loader/WorkerThreadableLoader.h"
 
 #include "core/dom/CrossThreadTask.h"
 #include "core/dom/Document.h"
 #include "core/loader/DocumentThreadableLoader.h"
 #include "core/timing/WorkerGlobalScopePerformance.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerLoaderProxy.h"
-#include "core/workers/WorkerThread.h"
+#include "core/workers/WorkerScript.h"
 #include "platform/ThreadSafeFunctional.h"
 #include "platform/WaitableEvent.h"
 #include "platform/heap/SafePoint.h"
 #include "platform/network/ResourceError.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/network/ResourceResponse.h"
 #include "platform/network/ResourceTimingInfo.h"
 #include "platform/weborigin/SecurityPolicy.h"
 #include "public/platform/Platform.h"
 #include "wtf/MainThread.h"
@@ skipping 211 matching lines @@
 void WorkerThreadableLoader::MainThreadBridgeBase::didReceiveResourceTiming(const ResourceTimingInfo& info)
 {
     forwardTaskToWorker(createCrossThreadTask(&ThreadableLoaderClientWrapper::didReceiveResourceTiming, m_workerClientWrapper, info));
 }
 
 WorkerThreadableLoader::MainThreadAsyncBridge::MainThreadAsyncBridge(
     WorkerGlobalScope& workerGlobalScope,
     PassRefPtr<ThreadableLoaderClientWrapper> workerClientWrapper,
     const ThreadableLoaderOptions& options,
     const ResourceLoaderOptions& resourceLoaderOptions)
-    : MainThreadBridgeBase(workerClientWrapper, workerGlobalScope.thread()->workerLoaderProxy())
+    : MainThreadBridgeBase(workerClientWrapper, workerGlobalScope.workerScript()->workerLoaderProxy())
 {
     createLoaderInMainThread(options, resourceLoaderOptions);
 }
 
 void WorkerThreadableLoader::MainThreadAsyncBridge::start(const ResourceRequest& request, const WorkerGlobalScope& workerGlobalScope)
 {
     startInMainThread(request, workerGlobalScope);
 }
 
 WorkerThreadableLoader::MainThreadAsyncBridge::~MainThreadAsyncBridge()
 {
 }
 
 void WorkerThreadableLoader::MainThreadAsyncBridge::forwardTaskToWorker(PassOwnPtr<ExecutionContextTask> task)
 {
     loaderProxy()->postTaskToWorkerGlobalScope(task);
 }
 
 void WorkerThreadableLoader::MainThreadAsyncBridge::forwardTaskToWorkerOnLoaderDone(PassOwnPtr<ExecutionContextTask> task)
 {
     loaderProxy()->postTaskToWorkerGlobalScope(task);
 }
 
 WorkerThreadableLoader::MainThreadSyncBridge::MainThreadSyncBridge(
     WorkerGlobalScope& workerGlobalScope,
     PassRefPtr<ThreadableLoaderClientWrapper> workerClientWrapper,
     const ThreadableLoaderOptions& options,
     const ResourceLoaderOptions& resourceLoaderOptions)
-    : MainThreadBridgeBase(workerClientWrapper, workerGlobalScope.thread()->workerLoaderProxy())
+    : MainThreadBridgeBase(workerClientWrapper, workerGlobalScope.workerScript()->workerLoaderProxy())
     , m_done(false)
 {
     createLoaderInMainThread(options, resourceLoaderOptions);
 }
 
 void WorkerThreadableLoader::MainThreadSyncBridge::start(const ResourceRequest& request, const WorkerGlobalScope& workerGlobalScope)
 {
-    WaitableEvent* shutdownEvent = workerGlobalScope.thread()->shutdownEvent();
+    WaitableEvent* shutdownEvent = workerGlobalScope.workerScript()->shutdownEvent();
     m_loaderDoneEvent = adoptPtr(new WaitableEvent());
 
     startInMainThread(request, workerGlobalScope);
 
     size_t signaledIndex;
     {
         Vector<WaitableEvent*> events;
         // Order is important; indicies are used later.
         events.append(shutdownEvent);
         events.append(m_loaderDoneEvent.get());
@@ skipping 44 matching lines @@
 
     MutexLocker lock(m_lock);
     RELEASE_ASSERT(!m_done);
 
     m_clientTasks.append(task);
     m_done = true;
     m_loaderDoneEvent->signal();
 }
 
 } // namespace blink