| Index: Source/core/workers/DedicatedWorkerGlobalScope.h
|
| diff --git a/Source/core/workers/DedicatedWorkerContext.h b/Source/core/workers/DedicatedWorkerGlobalScope.h
|
| similarity index 73%
|
| rename from Source/core/workers/DedicatedWorkerContext.h
|
| rename to Source/core/workers/DedicatedWorkerGlobalScope.h
|
| index d1631084ab5572c86d214172df63e3826716a38e..9654a463055d1c34bf9f7cf0e4b89f33958c8b4a 100644
|
| --- a/Source/core/workers/DedicatedWorkerContext.h
|
| +++ b/Source/core/workers/DedicatedWorkerGlobalScope.h
|
| @@ -28,24 +28,24 @@
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef DedicatedWorkerContext_h
|
| -#define DedicatedWorkerContext_h
|
| +#ifndef DedicatedWorkerGlobalScope_h
|
| +#define DedicatedWorkerGlobalScope_h
|
|
|
| #include "core/dom/MessagePort.h"
|
| #include "core/page/ContentSecurityPolicy.h"
|
| -#include "core/workers/WorkerContext.h"
|
| +#include "core/workers/WorkerGlobalScope.h"
|
|
|
| namespace WebCore {
|
|
|
| class DedicatedWorkerThread;
|
|
|
| - class DedicatedWorkerContext : public WorkerContext {
|
| + class DedicatedWorkerGlobalScope : public WorkerGlobalScope {
|
| public:
|
| - typedef WorkerContext Base;
|
| - static PassRefPtr<DedicatedWorkerContext> create(const KURL&, const String& userAgent, DedicatedWorkerThread*, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, PassRefPtr<SecurityOrigin> topOrigin, double timeOrigin);
|
| - virtual ~DedicatedWorkerContext();
|
| + typedef WorkerGlobalScope Base;
|
| + static PassRefPtr<DedicatedWorkerGlobalScope> create(const KURL&, const String& userAgent, DedicatedWorkerThread*, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, PassRefPtr<SecurityOrigin> topOrigin, double timeOrigin);
|
| + virtual ~DedicatedWorkerGlobalScope();
|
|
|
| - virtual bool isDedicatedWorkerContext() const OVERRIDE { return true; }
|
| + virtual bool isDedicatedWorkerGlobalScope() const OVERRIDE { return true; }
|
|
|
| // Overridden to allow us to check our pending activity after executing imported script.
|
| virtual void importScripts(const Vector<String>& urls, ExceptionCode&) OVERRIDE;
|
| @@ -60,9 +60,9 @@ namespace WebCore {
|
| DedicatedWorkerThread* thread();
|
|
|
| private:
|
| - DedicatedWorkerContext(const KURL&, const String& userAgent, DedicatedWorkerThread*, PassRefPtr<SecurityOrigin> topOrigin, double timeOrigin);
|
| + DedicatedWorkerGlobalScope(const KURL&, const String& userAgent, DedicatedWorkerThread*, PassRefPtr<SecurityOrigin> topOrigin, double timeOrigin);
|
| };
|
|
|
| } // namespace WebCore
|
|
|
| -#endif // DedicatedWorkerContext_h
|
| +#endif // DedicatedWorkerGlobalScope_h
|
|
|