Rename WorkerContext to WorkerGlobalScope

Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.cpp

 /*
  * Copyright (C) 2010, 2012 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 19 matching lines @@
 
 #include "config.h"
 #include "WorkerFileSystemCallbacksBridge.h"
 
 #include "WebCommonWorkerClient.h"
 #include "WebFileSystemCallbacksImpl.h"
 #include "WebWorkerBase.h"
 #include "bindings/v8/WorkerScriptController.h"
 #include "core/dom/CrossThreadTask.h"
 #include "core/platform/network/BlobData.h"
-#include "core/workers/WorkerContext.h"
+#include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerLoaderProxy.h"
 #include "core/workers/WorkerThread.h"
 #include "public/platform/WebFileInfo.h"
 #include "public/platform/WebFileSystemEntry.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURL.h"
 #include "weborigin/KURL.h"
 #include "wtf/MainThread.h"
 #include "wtf/Threading.h"
 #include "wtf/UnusedParam.h"
@@ skipping 96 matching lines @@
     {
         ASSERT(m_bridge);
     }
 
     RefPtr<WorkerFileSystemCallbacksBridge> m_bridge;
     const String m_mode;
 };
 
 // Observes the worker context. By keeping this separate, it is easier to verify
 // that it only gets deleted on the worker context thread which is verified by ~Observer.
-class WorkerFileSystemContextObserver : public WebCore::WorkerContext::Observer {
+class WorkerFileSystemContextObserver : public WebCore::WorkerGlobalScope::Observer {
 public:
-    static PassOwnPtr<WorkerFileSystemContextObserver> create(WorkerContext* context, PassRefPtr<WorkerFileSystemCallbacksBridge> bridge)
+    static PassOwnPtr<WorkerFileSystemContextObserver> create(WorkerGlobalScope* context, PassRefPtr<WorkerFileSystemCallbacksBridge> bridge)
     {
         return adoptPtr(new WorkerFileSystemContextObserver(context, bridge));
     }
 
-    // WorkerContext::Observer method.
+    // WorkerGlobalScope::Observer method.
     virtual void notifyStop()
     {
         m_bridge->stop();
     }
 
 private:
-    WorkerFileSystemContextObserver(WorkerContext* context, PassRefPtr<WorkerFileSystemCallbacksBridge> bridge)
-        : WebCore::WorkerContext::Observer(context)
+    WorkerFileSystemContextObserver(WorkerGlobalScope* context, PassRefPtr<WorkerFileSystemCallbacksBridge> bridge)
+        : WebCore::WorkerGlobalScope::Observer(context)
         , m_bridge(bridge)
     {
     }
 
     RefPtr<WorkerFileSystemCallbacksBridge> m_bridge;
 };
 
 void WorkerFileSystemCallbacksBridge::stop()
 {
-    ASSERT(m_workerContext->isContextThread());
+    ASSERT(m_workerGlobalScope->isContextThread());
     {
         MutexLocker locker(m_loaderProxyMutex);
         m_workerLoaderProxy = 0;
     }
 
     if (m_callbacksOnWorkerThread)
         m_callbacksOnWorkerThread->didFail(WebFileErrorAbort);
 
     cleanUpAfterCallback();
 }
 
 void WorkerFileSystemCallbacksBridge::cleanUpAfterCallback()
 {
-    ASSERT(m_workerContext->isContextThread());
+    ASSERT(m_workerGlobalScope->isContextThread());
 
     m_callbacksOnWorkerThread = 0;
-    if (m_workerContextObserver) {
-        WorkerFileSystemContextObserver* observer = m_workerContextObserver;
-        m_workerContextObserver = 0;
+    if (m_workerGlobalScopeObserver) {
+        WorkerFileSystemContextObserver* observer = m_workerGlobalScopeObserver;
+        m_workerGlobalScopeObserver = 0;
         // The next line may delete this.
         delete observer;
     }
 }
 
 void WorkerFileSystemCallbacksBridge::postOpenFileSystemToMainThread(WebCommonWorkerClient* commonClient, WebFileSystemType type, long long size, bool create, const String& mode)
 {
     dispatchTaskToMainThread(
         createCallbackTask(&openFileSystemOnMainThread,
                            AllowCrossThreadAccess(commonClient), type, size, create,
@@ skipping 188 matching lines @@
 
 void WorkerFileSystemCallbacksBridge::didReadDirectoryOnMainThread(const WebVector<WebFileSystemEntry>& entries, bool hasMore, const String& mode)
 {
     mayPostTaskToWorker(
         createCallbackTask(&didReadDirectoryOnWorkerThread,
                            this, entries, hasMore), mode);
 }
 
 WorkerFileSystemCallbacksBridge::WorkerFileSystemCallbacksBridge(WebCore::WorkerLoaderProxy* workerLoaderProxy, ScriptExecutionContext* scriptExecutionContext, WebFileSystemCallbacksImpl* callbacks)
     : m_workerLoaderProxy(workerLoaderProxy)
-    , m_workerContext(scriptExecutionContext)
-    , m_workerContextObserver(WorkerFileSystemContextObserver::create(static_cast<WorkerContext*>(m_workerContext), this).leakPtr())
+    , m_workerGlobalScope(scriptExecutionContext)
+    , m_workerGlobalScopeObserver(WorkerFileSystemContextObserver::create(static_cast<WorkerGlobalScope*>(m_workerGlobalScope), this).leakPtr())
     , m_callbacksOnWorkerThread(callbacks)
 {
-    ASSERT(m_workerContext->isContextThread());
+    ASSERT(m_workerGlobalScope->isContextThread());
 }
 
 WorkerFileSystemCallbacksBridge::~WorkerFileSystemCallbacksBridge()
 {
     ASSERT(!m_callbacksOnWorkerThread);
 }
 
 void WorkerFileSystemCallbacksBridge::didFailOnWorkerThread(ScriptExecutionContext*, PassRefPtr<WorkerFileSystemCallbacksBridge> bridge, WebFileError error)
 {
     bridge->m_callbacksOnWorkerThread->didFail(error);
@@ skipping 28 matching lines @@
 void WorkerFileSystemCallbacksBridge::runTaskOnMainThread(WebCore::ScriptExecutionContext* scriptExecutionContext, PassRefPtr<WorkerFileSystemCallbacksBridge> bridge, PassOwnPtr<WebCore::ScriptExecutionContext::Task> taskToRun)
 {
     ASSERT(isMainThread());
     taskToRun->performTask(scriptExecutionContext);
 }
 
 void WorkerFileSystemCallbacksBridge::runTaskOnWorkerThread(WebCore::ScriptExecutionContext* scriptExecutionContext, PassRefPtr<WorkerFileSystemCallbacksBridge> bridge, PassOwnPtr<WebCore::ScriptExecutionContext::Task> taskToRun)
 {
     if (!bridge->m_callbacksOnWorkerThread)
         return;
-    ASSERT(bridge->m_workerContext->isContextThread());
+    ASSERT(bridge->m_workerGlobalScope->isContextThread());
     taskToRun->performTask(scriptExecutionContext);
 
     // taskToRun does the callback.
     bridge->cleanUpAfterCallback();
 
     // WorkerFileSystemCallbacksBridge may be deleted here when bridge goes out of scope.
 }
 
 void WorkerFileSystemCallbacksBridge::dispatchTaskToMainThread(PassOwnPtr<WebCore::ScriptExecutionContext::Task> task)
 {
     ASSERT(m_workerLoaderProxy);
-    ASSERT(m_workerContext->isContextThread());
+    ASSERT(m_workerGlobalScope->isContextThread());
     WebWorkerBase::dispatchTaskToMainThread(createCallbackTask(&runTaskOnMainThread, RefPtr<WorkerFileSystemCallbacksBridge>(this).release(), task));
 }
 
 void WorkerFileSystemCallbacksBridge::mayPostTaskToWorker(PassOwnPtr<ScriptExecutionContext::Task> task, const String& mode)
 {
     // Relies on its caller (MainThreadFileSystemCallbacks:did*) to keep WorkerFileSystemCallbacksBridge alive.
     ASSERT(isMainThread());
 
     MutexLocker locker(m_loaderProxyMutex);
     if (m_workerLoaderProxy)
-        m_workerLoaderProxy->postTaskForModeToWorkerContext(createCallbackTask(&runTaskOnWorkerThread, this, task), mode);
+        m_workerLoaderProxy->postTaskForModeToWorkerGlobalScope(createCallbackTask(&runTaskOnWorkerThread, this, task), mode);
 }
 
 } // namespace WebCore