Introduce ExecutionContextClient

Source/core/dom/ExecutionContext.h

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 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:
  * 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
@@ skipping 11 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #ifndef ExecutionContext_h
 #define ExecutionContext_h
 
 #include "core/dom/ActiveDOMObject.h"
+#include "core/dom/ExecutionContextClient.h"
 #include "core/dom/SecurityContext.h"
 #include "core/events/ErrorEvent.h"
 #include "core/fetch/CrossOriginAccessControl.h"
 #include "core/frame/ConsoleTypes.h"
 #include "core/frame/DOMTimer.h"
 #include "core/platform/LifecycleContext.h"
 #include "weborigin/KURL.h"
 #include "wtf/HashSet.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
@@ skipping 14 matching lines @@
 class MessagePort;
 class PublicURLManager;
 class ScriptCallStack;
 class ScriptState;
 
 class ExecutionContext : public LifecycleContext, public SecurityContext {
 public:
     ExecutionContext();
     virtual ~ExecutionContext();
 
-    virtual bool isDocument() const { return false; }
-    virtual bool isWorkerGlobalScope() const { return false; }
-
-    virtual bool isJSExecutionForbidden() const = 0;
-
-    virtual DOMWindow* executingWindow() { return 0; }
-    virtual void userEventWasHandled() { }
-
-    const KURL& url() const { return virtualURL(); }
-    KURL completeURL(const String& url) const { return virtualCompleteURL(url); }
-
-    virtual String userAgent(const KURL&) const = 0;
-
-    virtual void disableEval(const String& errorMessage) = 0;
+    // Delegating to ExecutionContextClient
+    void setClient(ExecutionContextClient* client) { m_client = client; }
+    bool isDocument() const { return m_client && m_client->isDocument(); }
+    bool isWorkerGlobalScope() { return m_client && m_client->isWorkerGlobalScope(); }
+    bool isJSExecutionForbidden() { return m_client && m_client->isJSExecutionForbidden(); }
+    EventQueue* eventQueue() const;
+    const KURL& url() const;
+    KURL completeURL(const String& url) const;
+    void userEventWasHandled();
+    void disableEval(const String& errorMessage);
+    DOMWindow* executingWindow() const;
+    String userAgent(const KURL&) const;
+    void postTask(PassOwnPtr<ExecutionContextTask>);
+    double timerAlignmentInterval() const;
 
     bool shouldSanitizeScriptError(const String& sourceURL, AccessControlStatus);
     void reportException(PassRefPtr<ErrorEvent>, PassRefPtr<ScriptCallStack>, AccessControlStatus);
 
     void addConsoleMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber);
     void addConsoleMessage(MessageSource, MessageLevel, const String& message, ScriptState* = 0);
 
     PublicURLManager& publicURLManager();
 
     // Active objects are not garbage collected even if inaccessible, e.g. because their activity may result in callbacks being invoked.
@@ skipping 13 matching lines @@
     // MessagePort is conceptually a kind of ActiveDOMObject, but it needs to be tracked separately for message dispatch.
     void processMessagePortMessagesSoon();
     void dispatchMessagePortEvents();
     void createdMessagePort(MessagePort*);
     void destroyedMessagePort(MessagePort*);
     const HashSet<MessagePort*>& messagePorts() const { return m_messagePorts; }
 
     void ref() { refExecutionContext(); }
     void deref() { derefExecutionContext(); }
 
-    virtual void postTask(PassOwnPtr<ExecutionContextTask>) = 0; // Executes the task on context's thread asynchronously.
-
     // Gets the next id in a circular sequence from 1 to 2^31-1.
     int circularSequentialID();
 
     void didChangeTimerAlignmentInterval();
-    virtual double timerAlignmentInterval() const;
-
-    virtual EventQueue* eventQueue() const = 0;
 
     void setDatabaseContext(DatabaseContext*);
 
 protected:
 
     ContextLifecycleNotifier* lifecycleNotifier();
 
 private:
     friend class DOMTimer; // For installNewTimeout() and removeTimeoutByID() below.
 
-    virtual const KURL& virtualURL() const = 0;
-    virtual KURL virtualCompleteURL(const String&) const = 0;
-
-    virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, ScriptState*) = 0;
-    virtual EventTarget* errorEventTarget() = 0;
-    virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack>) = 0;
     bool dispatchErrorEvent(PassRefPtr<ErrorEvent>, AccessControlStatus);
 
     void closeMessagePorts();
 
     virtual void refExecutionContext() = 0;
     virtual void derefExecutionContext() = 0;
     virtual PassOwnPtr<LifecycleNotifier> createLifecycleNotifier() OVERRIDE;
 
     // Implementation details for DOMTimer. No other classes should call these functions.
     int installNewTimeout(PassOwnPtr<ScheduledAction>, int timeout, bool singleShot);
     void removeTimeoutByID(int timeoutID); // This makes underlying DOMTimer instance destructed.
 
+    ExecutionContextClient* m_client;
     HashSet<MessagePort*> m_messagePorts;
 
     int m_circularSequentialID;
     typedef HashMap<int, OwnPtr<DOMTimer> > TimeoutMap;
     TimeoutMap m_timeouts;
 
     bool m_inDispatchErrorEvent;
     class PendingException;
     OwnPtr<Vector<OwnPtr<PendingException> > > m_pendingExceptions;
 
     bool m_activeDOMObjectsAreSuspended;
     bool m_activeDOMObjectsAreStopped;
 
     OwnPtr<PublicURLManager> m_publicURLManager;
 
     RefPtr<DatabaseContext> m_databaseContext;
 
     // The location of this member is important; to make sure contextDestroyed() notification on
     // ExecutionContext's members (notably m_timeouts) is called before they are destructed,
     // m_lifecycleNotifer should be placed *after* such members.
     OwnPtr<ContextLifecycleNotifier> m_lifecycleNotifier;
 };
 
 } // namespace WebCore
 
 #endif // ExecutionContext_h