Revert r189385 "Remove LifecycleContext" and r189391, r189530, r189456 that block it

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 10 matching lines @@
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * 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/ContextLifecycleNotifier.h"
 #include "core/dom/SecurityContext.h"
 #include "core/fetch/AccessControlStatus.h"
+#include "platform/LifecycleContext.h"
 #include "platform/Supplementable.h"
 #include "platform/heap/Handle.h"
 #include "platform/weborigin/KURL.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace blink {
 
 class ActiveDOMObject;
 class ConsoleMessage;
+class ContextLifecycleNotifier;
 class DOMTimerCoordinator;
 class ErrorEvent;
 class EventQueue;
 class EventTarget;
 class ExecutionContextTask;
 class LocalDOMWindow;
 class PublicURLManager;
 class SecurityOrigin;
 class ScriptCallStack;
 
 class ExecutionContext
-    : public ContextLifecycleNotifier, public WillBeHeapSupplementable<ExecutionContext> {
+    : public LifecycleContext<ExecutionContext>
+    , public WillBeHeapSupplementable<ExecutionContext> {
 public:
     virtual void trace(Visitor*) override;
 
     virtual bool isDocument() const { return false; }
     virtual bool isWorkerGlobalScope() const { return false; }
     virtual bool isDedicatedWorkerGlobalScope() const { return false; }
     virtual bool isSharedWorkerGlobalScope() const { return false; }
     virtual bool isServiceWorkerGlobalScope() const { return false; }
     virtual bool isJSExecutionForbidden() const { return false; }
     SecurityOrigin* securityOrigin();
@@ skipping 19 matching lines @@
     KURL contextCompleteURL(const String& url) const { return virtualCompleteURL(url); }
 
     bool shouldSanitizeScriptError(const String& sourceURL, AccessControlStatus);
     void reportException(PassRefPtrWillBeRawPtr<ErrorEvent>, int scriptId, PassRefPtrWillBeRawPtr<ScriptCallStack>, AccessControlStatus);
 
     virtual void addConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) = 0;
     virtual void logExceptionToConsole(const String& errorMessage, int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack>) = 0;
 
     PublicURLManager& publicURLManager();
 
+    // Active objects are not garbage collected even if inaccessible, e.g. because their activity may result in callbacks being invoked.
+    bool hasPendingActivity();
+
     void suspendActiveDOMObjects();
     void resumeActiveDOMObjects();
     void stopActiveDOMObjects();
     unsigned activeDOMObjectCount();
 
     virtual void suspendScheduledTasks();
     virtual void resumeScheduledTasks();
     virtual bool tasksNeedSuspension() { return false; }
     virtual void tasksWereSuspended() { }
     virtual void tasksWereResumed() { }
@@ skipping 13 matching lines @@
     int circularSequentialID();
 
     PassOwnPtr<LifecycleNotifier<ExecutionContext> > createLifecycleNotifier();
 
     virtual EventTarget* errorEventTarget() = 0;
     virtual EventQueue* eventQueue() const = 0;
 
     void enforceStrictMixedContentChecking() { m_strictMixedContentCheckingEnforced = true; }
     bool shouldEnforceStrictMixedContentChecking() const { return m_strictMixedContentCheckingEnforced; }
 
-    // Methods related to window interaction. It should be used to manage window
-    // focusing and window creation permission for an ExecutionContext.
-    void allowWindowInteraction();
-    void consumeWindowInteraction();
-    bool isWindowInteractionAllowed() const;
+    void allowWindowFocus();
+    void consumeWindowFocus();
+    bool isWindowFocusAllowed() const;
 
 protected:
     ExecutionContext();
     virtual ~ExecutionContext();
 
     virtual const KURL& virtualURL() const = 0;
     virtual KURL virtualCompleteURL(const String&) const = 0;
 
     ContextLifecycleNotifier& lifecycleNotifier();
 
@@ skipping 12 matching lines @@
     class PendingException;
     OwnPtrWillBeMember<WillBeHeapVector<OwnPtrWillBeMember<PendingException> > > m_pendingExceptions;
 
     bool m_activeDOMObjectsAreSuspended;
     bool m_activeDOMObjectsAreStopped;
 
     OwnPtrWillBeMember<PublicURLManager> m_publicURLManager;
 
     bool m_strictMixedContentCheckingEnforced;
 
-    // Counter that keeps track of how many window interaction calls are allowed
-    // for this ExecutionContext. Callers are expected to call
-    // |allowWindowInteraction()| and |consumeWindowInteraction()| in order to
-    // increment and decrement the counter.
-    int m_windowInteractionTokens;
+    OwnPtr<ContextLifecycleNotifier> m_lifecycleNotifier;
+
+    // Counter that keeps track of how many window focus calls are allowed for
+    // this ExecutionContext. Callers are expected to call |allowWindowFocus()|
+    // and |consumeWindowFocus()| in order to increment and decrement the
+    // counter.
+    int m_windowFocusTokens;
 };
 
 } // namespace blink
 
 #endif // ExecutionContext_h