Move ExecutionContext's task suspension from FrameLoader to Page

third_party/WebKit/Source/core/loader/FrameLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
  * Copyright (C) 2011 Google Inc. All rights reserved.
@@ skipping 213 matching lines @@
   m_provisionalDocumentLoader =
       client()->createDocumentLoader(m_frame, initialRequest, SubstituteData(),
                                      ClientRedirectPolicy::NotClientRedirect);
   m_provisionalDocumentLoader->startLoadingMainResource();
   m_frame->document()->cancelParsing();
   m_stateMachine.advanceTo(
       FrameLoaderStateMachine::DisplayingInitialEmptyDocument);
   // Self-suspend if created in an already suspended Page. Note that both
   // startLoadingMainResource() and cancelParsing() may have already detached
   // the frame, since they both fire JS events.
-  if (m_frame->page() && m_frame->page()->suspended())
+  if (m_frame->page() && m_frame->page()->suspended()) {
+    m_provisionalDocumentLoader->fetcher()->setDefersLoading(true);
+    m_frame->document()->suspendScheduledTasks();
     setDefersLoading(true);
+  }
   takeObjectSnapshot();
 }
 
 FrameLoaderClient* FrameLoader::client() const {
   return static_cast<FrameLoaderClient*>(m_frame->client());
 }
 
 void FrameLoader::setDefersLoading(bool defers) {
   if (m_provisionalDocumentLoader)
     m_provisionalDocumentLoader->fetcher()->setDefersLoading(defers);
 
-  if (Document* document = m_frame->document()) {
-    document->fetcher()->setDefersLoading(defers);
-    if (defers)
-      document->suspendScheduledTasks();
-    else
-      document->resumeScheduledTasks();
-  }
-
   if (!defers) {
     if (m_deferredHistoryLoad) {
       load(FrameLoadRequest(nullptr, m_deferredHistoryLoad->m_request),
            m_deferredHistoryLoad->m_loadType,
            m_deferredHistoryLoad->m_item.get(),
            m_deferredHistoryLoad->m_historyLoadType);
       m_deferredHistoryLoad.clear();
     }
     m_frame->navigationScheduler().startTimer();
     scheduleCheckCompleted();
@@ skipping 1692 matching lines @@
                          m_documentLoader ? m_documentLoader->url() : String());
   return tracedValue;
 }
 
 inline void FrameLoader::takeObjectSnapshot() const {
   TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this,
                                       toTracedValue());
 }
 
 }  // namespace blink