Rename WorkerContext to WorkerGlobalScope

Source/WebKit/chromium/src/WorkerStorageQuotaCallbacksBridge.cpp

 /*
  * Copyright (C) 2013 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 "config.h"
 #include "WorkerStorageQuotaCallbacksBridge.h"
 
 #include "WebCommonWorkerClient.h"
 #include "WebStorageQuotaCallbacks.h"
 #include "WebStorageQuotaCallbacksImpl.h"
 #include "WebWorkerBase.h"
 #include "core/dom/CrossThreadTask.h"
-#include "core/workers/WorkerContext.h"
+#include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerLoaderProxy.h"
 #include "wtf/MainThread.h"
 
 using namespace WebCore;
 
 namespace WebKit {
 
 // FIXME: Replace WebFrame parameter in queryStorageUsageAndQuota() with WebString and move the method to Platform so that we can remove all these complexity for Worker.
 class MainThreadStorageQuotaCallbacks : public WebStorageQuotaCallbacks {
 public:
@@ skipping 33 matching lines @@
         ASSERT(m_bridge);
     }
 
     RefPtr<WorkerStorageQuotaCallbacksBridge> m_bridge;
     const String m_mode;
 };
 
 // FIXME: Replace WebFrame parameter in queryStorageUsageAndQuota() with WebString and move the method to Platform so that we can remove all these complexity for Worker."
 // 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 WorkerStorageQuotaContextObserver : public WebCore::WorkerContext::Observer {
+class WorkerStorageQuotaContextObserver : public WebCore::WorkerGlobalScope::Observer {
 public:
-    static PassOwnPtr<WorkerStorageQuotaContextObserver> create(WorkerContext* context, PassRefPtr<WorkerStorageQuotaCallbacksBridge> bridge)
+    static PassOwnPtr<WorkerStorageQuotaContextObserver> create(WorkerGlobalScope* context, PassRefPtr<WorkerStorageQuotaCallbacksBridge> bridge)
     {
         return adoptPtr(new WorkerStorageQuotaContextObserver(context, bridge));
     }
 
-    // WorkerContext::Observer method.
+    // WorkerGlobalScope::Observer method.
     virtual void notifyStop()
     {
         m_bridge->stop();
     }
 
 private:
-    WorkerStorageQuotaContextObserver(WorkerContext* context, PassRefPtr<WorkerStorageQuotaCallbacksBridge> bridge)
-        : WebCore::WorkerContext::Observer(context)
+    WorkerStorageQuotaContextObserver(WorkerGlobalScope* context, PassRefPtr<WorkerStorageQuotaCallbacksBridge> bridge)
+        : WebCore::WorkerGlobalScope::Observer(context)
         , m_bridge(bridge)
     {
     }
 
     RefPtr<WorkerStorageQuotaCallbacksBridge> m_bridge;
 };
 
 void WorkerStorageQuotaCallbacksBridge::stop()
 {
-    ASSERT(m_workerContext->isContextThread());
+    ASSERT(m_workerGlobalScope->isContextThread());
     {
         MutexLocker locker(m_loaderProxyMutex);
         m_workerLoaderProxy = 0;
     }
 
     if (m_callbacksOnWorkerThread)
         m_callbacksOnWorkerThread->didFail(WebStorageQuotaErrorAbort);
 
     cleanUpAfterCallback();
 }
 
 void WorkerStorageQuotaCallbacksBridge::cleanUpAfterCallback()
 {
-    ASSERT(m_workerContext->isContextThread());
+    ASSERT(m_workerGlobalScope->isContextThread());
 
     m_callbacksOnWorkerThread = 0;
-    if (m_workerContextObserver) {
-        WorkerStorageQuotaContextObserver* observer = m_workerContextObserver;
-        m_workerContextObserver = 0;
+    if (m_workerGlobalScopeObserver) {
+        WorkerStorageQuotaContextObserver* observer = m_workerGlobalScopeObserver;
+        m_workerGlobalScopeObserver = 0;
         // The next line may delete this.
         delete observer;
     }
 }
 
-WorkerStorageQuotaCallbacksBridge::WorkerStorageQuotaCallbacksBridge(WebCore::WorkerLoaderProxy* workerLoaderProxy, WebCore::ScriptExecutionContext* workerContext, WebStorageQuotaCallbacksImpl* callbacks)
+WorkerStorageQuotaCallbacksBridge::WorkerStorageQuotaCallbacksBridge(WebCore::WorkerLoaderProxy* workerLoaderProxy, WebCore::ScriptExecutionContext* workerGlobalScope, WebStorageQuotaCallbacksImpl* callbacks)
     : m_workerLoaderProxy(workerLoaderProxy)
-    , m_workerContext(workerContext)
-    , m_workerContextObserver(WorkerStorageQuotaContextObserver::create(static_cast<WorkerContext*>(m_workerContext), this).leakPtr())
+    , m_workerGlobalScope(workerGlobalScope)
+    , m_workerGlobalScopeObserver(WorkerStorageQuotaContextObserver::create(static_cast<WorkerGlobalScope*>(m_workerGlobalScope), this).leakPtr())
     , m_callbacksOnWorkerThread(callbacks)
 {
-    ASSERT(m_workerContext->isContextThread());
+    ASSERT(m_workerGlobalScope->isContextThread());
 }
 
 WorkerStorageQuotaCallbacksBridge::~WorkerStorageQuotaCallbacksBridge()
 {
     // One way or another, the bridge should be stopped before it is destroyed.
     ASSERT(!m_callbacksOnWorkerThread);
 }
 
 void WorkerStorageQuotaCallbacksBridge::postQueryUsageAndQuotaToMainThread(WebCommonWorkerClient* commonClient, WebStorageQuotaType storageType, const String& mode)
 {
@@ skipping 32 matching lines @@
 {
     ASSERT(isMainThread());
     taskToRun->performTask(scriptExecutionContext);
 }
 
 void WorkerStorageQuotaCallbacksBridge::runTaskOnWorkerThread(WebCore::ScriptExecutionContext* scriptExecutionContext, PassRefPtr<WorkerStorageQuotaCallbacksBridge> bridge, PassOwnPtr<WebCore::ScriptExecutionContext::Task> taskToRun)
 {
     ASSERT(bridge);
     if (!bridge->m_callbacksOnWorkerThread)
         return;
-    ASSERT(bridge->m_workerContext);
-    ASSERT(bridge->m_workerContext->isContextThread());
+    ASSERT(bridge->m_workerGlobalScope);
+    ASSERT(bridge->m_workerGlobalScope->isContextThread());
     ASSERT(taskToRun);
     taskToRun->performTask(scriptExecutionContext);
 
     // taskToRun does the callback.
     bridge->cleanUpAfterCallback();
 
     // WorkerStorageQuotaCallbacksBridge may be deleted here when bridge goes out of scope.
 }
 
 void WorkerStorageQuotaCallbacksBridge::dispatchTaskToMainThread(PassOwnPtr<WebCore::ScriptExecutionContext::Task> task)
 {
     ASSERT(m_workerLoaderProxy);
-    ASSERT(m_workerContext->isContextThread());
+    ASSERT(m_workerGlobalScope->isContextThread());
     WebWorkerBase::dispatchTaskToMainThread(createCallbackTask(&runTaskOnMainThread, RefPtr<WorkerStorageQuotaCallbacksBridge>(this).release(), task));
 }
 
 void WorkerStorageQuotaCallbacksBridge::mayPostTaskToWorker(PassOwnPtr<ScriptExecutionContext::Task> task, const String& mode)
 {
     // Relies on its caller (MainThreadStorageQuotaCallbacks:did*) to keep WorkerStorageQuotaCallbacksBridge 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