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

Source/core/dom/ExecutionContext.cpp

 /*
  * 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.
  *
  */
 
 #include "config.h"
 #include "core/dom/ExecutionContext.h"
 
+#include "core/dom/ContextLifecycleNotifier.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "core/events/ErrorEvent.h"
 #include "core/events/EventTarget.h"
 #include "core/html/PublicURLManager.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/ScriptCallStack.h"
 #include "core/page/WindowFocusAllowedIndicator.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerThread.h"
 #include "wtf/MainThread.h"
@@ skipping 18 matching lines @@
     }
     String m_errorMessage;
     int m_lineNumber;
     int m_columnNumber;
     int m_scriptId;
     String m_sourceURL;
     RefPtrWillBeMember<ScriptCallStack> m_callStack;
 };
 
 ExecutionContext::ExecutionContext()
-    : ContextLifecycleNotifier(this)
-    , m_circularSequentialID(0)
+    : m_circularSequentialID(0)
     , m_inDispatchErrorEvent(false)
     , m_activeDOMObjectsAreSuspended(false)
     , m_activeDOMObjectsAreStopped(false)
     , m_strictMixedContentCheckingEnforced(false)
-    , m_windowInteractionTokens(0)
+    , m_windowFocusTokens(0)
 {
 }
 
 ExecutionContext::~ExecutionContext()
 {
 }
 
+bool ExecutionContext::hasPendingActivity()
+{
+    return lifecycleNotifier().hasPendingActivity();
+}
+
 void ExecutionContext::suspendActiveDOMObjects()
 {
     ASSERT(!m_activeDOMObjectsAreSuspended);
-    notifySuspendingActiveDOMObjects();
+    lifecycleNotifier().notifySuspendingActiveDOMObjects();
     m_activeDOMObjectsAreSuspended = true;
 }
 
 void ExecutionContext::resumeActiveDOMObjects()
 {
     ASSERT(m_activeDOMObjectsAreSuspended);
     m_activeDOMObjectsAreSuspended = false;
-    notifyResumingActiveDOMObjects();
+    lifecycleNotifier().notifyResumingActiveDOMObjects();
 }
 
 void ExecutionContext::stopActiveDOMObjects()
 {
     m_activeDOMObjectsAreStopped = true;
-    notifyStoppingActiveDOMObjects();
+    lifecycleNotifier().notifyStoppingActiveDOMObjects();
 }
 
 unsigned ExecutionContext::activeDOMObjectCount()
 {
-    return activeDOMObjects().size();
+    return lifecycleNotifier().activeDOMObjects().size();
 }
 
 void ExecutionContext::suspendScheduledTasks()
 {
     suspendActiveDOMObjects();
     tasksWereSuspended();
 }
 
 void ExecutionContext::resumeScheduledTasks()
 {
     resumeActiveDOMObjects();
     tasksWereResumed();
 }
 
 void ExecutionContext::suspendActiveDOMObjectIfNeeded(ActiveDOMObject* object)
 {
-    ASSERT(contains(object));
+    ASSERT(lifecycleNotifier().contains(object));
     // Ensure all ActiveDOMObjects are suspended also newly created ones.
     if (m_activeDOMObjectsAreSuspended)
         object->suspend();
 }
 
 bool ExecutionContext::shouldSanitizeScriptError(const String& sourceURL, AccessControlStatus corsStatus)
 {
     return !(securityOrigin()->canRequest(completeURL(sourceURL)) || corsStatus == SharableCrossOrigin);
 }
 
@@ skipping 66 matching lines @@
 const KURL& ExecutionContext::url() const
 {
     return virtualURL();
 }
 
 KURL ExecutionContext::completeURL(const String& url) const
 {
     return virtualCompleteURL(url);
 }
 
-void ExecutionContext::allowWindowInteraction()
+PassOwnPtr<LifecycleNotifier<ExecutionContext> > ExecutionContext::createLifecycleNotifier()
 {
-    ++m_windowInteractionTokens;
+    return ContextLifecycleNotifier::create(this);
 }
 
-void ExecutionContext::consumeWindowInteraction()
+ContextLifecycleNotifier& ExecutionContext::lifecycleNotifier()
 {
-    if (m_windowInteractionTokens == 0)
-        return;
-    --m_windowInteractionTokens;
+    return static_cast<ContextLifecycleNotifier&>(LifecycleContext<ExecutionContext>::lifecycleNotifier());
 }
 
-bool ExecutionContext::isWindowInteractionAllowed() const
+bool ExecutionContext::isIteratingOverObservers() const
+{
+    return m_lifecycleNotifier && m_lifecycleNotifier->isIteratingOverObservers();
+}
+
+void ExecutionContext::allowWindowFocus()
+{
+    ++m_windowFocusTokens;
+}
+
+void ExecutionContext::consumeWindowFocus()
+{
+    if (m_windowFocusTokens == 0)
+        return;
+    --m_windowFocusTokens;
+}
+
+bool ExecutionContext::isWindowFocusAllowed() const
 {
     // FIXME: WindowFocusAllowedIndicator::windowFocusAllowed() is temporary,
     // it will be removed as soon as WebScopedWindowFocusAllowedIndicator will
     // be updated to not use WindowFocusAllowedIndicator.
-    return m_windowInteractionTokens > 0 || WindowFocusAllowedIndicator::windowFocusAllowed();
+    return m_windowFocusTokens > 0 || WindowFocusAllowedIndicator::windowFocusAllowed();
 }
 
 void ExecutionContext::trace(Visitor* visitor)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_pendingExceptions);
     visitor->trace(m_publicURLManager);
     HeapSupplementable<ExecutionContext>::trace(visitor);
 #endif
-    ContextLifecycleNotifier::trace(visitor);
+    LifecycleContext<ExecutionContext>::trace(visitor);
 }
 
 } // namespace blink