Rename WorkerContext to WorkerGlobalScope

Source/WebKit/chromium/src/WorkerAllowMainThreadBridgeBase.cpp

 /*
  * Copyright (C) 2010, 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 19 matching lines @@
 
 #include "config.h"
 #include "WorkerAllowMainThreadBridgeBase.h"
 
 #include "wtf/MainThread.h"
 
 namespace {
 
 // Observes the worker context and notifies the bridge. This is kept
 // separate from the bridge so that it's destroyed correctly by ~Observer.
-class WorkerContextObserver : public WebCore::WorkerContext::Observer {
+class WorkerGlobalScopeObserver : public WebCore::WorkerGlobalScope::Observer {
 public:
-    static PassOwnPtr<WorkerContextObserver> create(WebCore::WorkerContext* context, PassRefPtr<WebKit::WorkerAllowMainThreadBridgeBase> bridge)
+    static PassOwnPtr<WorkerGlobalScopeObserver> create(WebCore::WorkerGlobalScope* context, PassRefPtr<WebKit::WorkerAllowMainThreadBridgeBase> bridge)
     {
-        return adoptPtr(new WorkerContextObserver(context, bridge));
+        return adoptPtr(new WorkerGlobalScopeObserver(context, bridge));
     }
 
-    // WorkerContext::Observer method.
+    // WorkerGlobalScope::Observer method.
     virtual void notifyStop()
     {
         if (!m_bridge)
             return;
         m_bridge->cancel();
     }
 
 private:
-    WorkerContextObserver(WebCore::WorkerContext* context, PassRefPtr<WebKit::WorkerAllowMainThreadBridgeBase> bridge)
-        : WebCore::WorkerContext::Observer(context)
+    WorkerGlobalScopeObserver(WebCore::WorkerGlobalScope* context, PassRefPtr<WebKit::WorkerAllowMainThreadBridgeBase> bridge)
+        : WebCore::WorkerGlobalScope::Observer(context)
         , m_bridge(bridge)
     {
     }
 
     RefPtr<WebKit::WorkerAllowMainThreadBridgeBase> m_bridge;
 };
 
 }
 
 namespace WebKit {
 
-WorkerAllowMainThreadBridgeBase::WorkerAllowMainThreadBridgeBase(WebCore::WorkerContext* workerContext, WebWorkerBase* webWorkerBase)
+WorkerAllowMainThreadBridgeBase::WorkerAllowMainThreadBridgeBase(WebCore::WorkerGlobalScope* workerGlobalScope, WebWorkerBase* webWorkerBase)
     : m_webWorkerBase(webWorkerBase)
-    , m_workerContextObserver(WorkerContextObserver::create(workerContext, this).leakPtr())
+    , m_workerGlobalScopeObserver(WorkerGlobalScopeObserver::create(workerGlobalScope, this).leakPtr())
 {
 }
 
 void WorkerAllowMainThreadBridgeBase::postTaskToMainThread(PassOwnPtr<AllowParams> params)
 {
     WebWorkerBase::dispatchTaskToMainThread(
         createCallbackTask(&WorkerAllowMainThreadBridgeBase::allowTask, params, this));
 }
 
 // static
 void WorkerAllowMainThreadBridgeBase::allowTask(WebCore::ScriptExecutionContext*, PassOwnPtr<AllowParams> params, PassRefPtr<WorkerAllowMainThreadBridgeBase> bridge)
 {
     ASSERT(isMainThread());
     if (!bridge)
         return;
     MutexLocker locker(bridge->m_mutex);
     if (!bridge->m_webWorkerBase)
         return;
     WebCommonWorkerClient* commonClient = bridge->m_webWorkerBase->commonClient();
     if (!commonClient)
         return;
     bool allow = bridge->allowOnMainThread(commonClient, params.get());
-    bridge->m_webWorkerBase->workerLoaderProxy()->postTaskForModeToWorkerContext(
+    bridge->m_webWorkerBase->workerLoaderProxy()->postTaskForModeToWorkerGlobalScope(
         createCallbackTask(&didComplete, bridge, allow), params->m_mode.isolatedCopy());
 }
 
 // static
 void WorkerAllowMainThreadBridgeBase::didComplete(WebCore::ScriptExecutionContext* context, PassRefPtr<WorkerAllowMainThreadBridgeBase> bridge, bool result)
 {
     bridge->m_result = result;
 }
 
 } // namespace WebKit