Merge ExecutionContextClient and ExecutionContext

Source/core/workers/WorkerGlobalScope.h

 /*
  * Copyright (C) 2008, 2009 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 41 matching lines @@
 class ConsoleMessageStorage;
 class ExceptionState;
 class ScheduledAction;
 class WorkerClients;
 class WorkerConsole;
 class WorkerInspectorController;
 class WorkerLocation;
 class WorkerNavigator;
 class WorkerThread;
 
-class WorkerGlobalScope : public RefCountedWillBeGarbageCollectedFinalized<WorkerGlobalScope>, public SecurityContext, public ExecutionContext, public ExecutionContextClient, public WillBeHeapSupplementable<WorkerGlobalScope>, public EventTargetWithInlineData, public DOMWindowBase64 {
+class WorkerGlobalScope : public RefCountedWillBeGarbageCollectedFinalized<WorkerGlobalScope>, public SecurityContext, public ExecutionContext, public WillBeHeapSupplementable<WorkerGlobalScope>, public EventTargetWithInlineData, public DOMWindowBase64 {
     DEFINE_WRAPPERTYPEINFO();
     REFCOUNTED_EVENT_TARGET(WorkerGlobalScope);
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(WorkerGlobalScope);
 public:
     virtual ~WorkerGlobalScope();
 
     virtual bool isWorkerGlobalScope() const OVERRIDE FINAL { return true; }
-    virtual bool isSharedWorkerGlobalScope() const OVERRIDE { return false; }
-    virtual bool isDedicatedWorkerGlobalScope() const OVERRIDE { return false; }
-    virtual bool isServiceWorkerGlobalScope() const OVERRIDE { return false; }
 
     virtual ExecutionContext* executionContext() const OVERRIDE FINAL;
 
     virtual void countFeature(UseCounter::Feature) const;
     virtual void countDeprecation(UseCounter::Feature) const;
 
     const KURL& url() const { return m_url; }
     KURL completeURL(const String&) const;
 
     virtual String userAgent(const KURL&) const OVERRIDE FINAL;
@@ skipping 48 matching lines @@
 
     bool idleNotification();
 
     double timeOrigin() const { return m_timeOrigin; }
 
     WorkerClients* clients() { return m_workerClients.get(); }
 
     using SecurityContext::securityOrigin;
     using SecurityContext::contentSecurityPolicy;
 
-    virtual void addMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) OVERRIDE FINAL;
+    virtual void addConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) OVERRIDE FINAL;
     ConsoleMessageStorage* messageStorage();
 
     virtual void trace(Visitor*) OVERRIDE;
 
 protected:
     WorkerGlobalScope(const KURL&, const String& userAgent, WorkerThread*, double timeOrigin, PassOwnPtrWillBeRawPtr<WorkerClients>);
     void applyContentSecurityPolicyFromString(const String& contentSecurityPolicy, ContentSecurityPolicyHeaderType);
 
     virtual void logExceptionToConsole(const String& errorMessage, int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack>) OVERRIDE;
     void addMessageToWorkerConsole(PassRefPtrWillBeRawPtr<ConsoleMessage>);
@@ skipping 33 matching lines @@
     TerminationObserver* m_terminationObserver;
 
     OwnPtrWillBeMember<ConsoleMessageStorage> m_messageStorage;
 };
 
 DEFINE_TYPE_CASTS(WorkerGlobalScope, ExecutionContext, context, context->isWorkerGlobalScope(), context.isWorkerGlobalScope());
 
 } // namespace blink
 
 #endif // WorkerGlobalScope_h