Move FrameLoader completion check timer to loading task runner.

third_party/WebKit/Source/core/frame/LocalFrame.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 362 matching lines @@
 void LocalFrame::detach(FrameDetachType type)
 {
     PluginScriptForbiddenScope forbidPluginDestructorScripting;
     m_loader.stopAllLoaders();
     // Don't allow any new child frames to load in this frame: attaching a new
     // child frame during or after detaching children results in an attached
     // frame on a detached DOM tree, which is bad.
     SubframeLoadingDisabler disabler(*document());
     m_loader.dispatchUnloadEvent();
     detachChildren();
-    m_frameScheduler.reset();
 
     // All done if detaching the subframes brought about a detach of this frame also.
     if (!client())
         return;
 
     // stopAllLoaders() needs to be called after detachChildren(), because detachChildren()
     // will trigger the unload event handlers of any child frames, and those event
     // handlers might start a new subresource load in this frame.
     m_loader.stopAllLoaders();
     m_loader.detach();
     document()->detachLayoutTree();
     // This is the earliest that scripting can be disabled:
     // - FrameLoader::detach() can fire XHR abort events
     // - Document::detachLayoutTree()'s deferred widget updates can run script.
     ScriptForbiddenScope forbidScript;
     m_loader.clear();
-    // Clear FrameScheduler again in case it is recreated in scripting.
-    m_frameScheduler.reset();
     if (!client())
         return;
 
     client()->willBeDetached();
     // Notify ScriptController that the frame is closing, since its cleanup ends up calling
     // back to FrameLoaderClient via WindowProxy.
     script().clearForClose();
     setView(nullptr);
 
     m_host->eventHandlerRegistry().didRemoveAllEventHandlers(*localDOMWindow());
 
     // Signal frame destruction here rather than in the destructor.
     // Main motivation is to avoid being dependent on its exact timing (Oilpan.)
     LocalFrameLifecycleNotifier::notifyContextDestroyed();
 
     // TODO: Page should take care of updating focus/scrolling instead of Frame.
     // TODO: It's unclear as to why this is called more than once, but it is,
     // so page() could be null.
     if (page() && page()->focusController().focusedFrame() == this)
         page()->focusController().setFocusedFrame(nullptr);
 
     if (page() && page()->scrollingCoordinator() && m_view)
         page()->scrollingCoordinator()->willDestroyScrollableArea(m_view.get());
 
     InspectorInstrumentation::frameDetachedFromParent(this);
     Frame::detach(type);
 
     m_supplements.clear();
+    m_frameScheduler.reset();
     WeakIdentifierMap<LocalFrame>::notifyObjectDestroyed(this);
 }
 
 bool LocalFrame::prepareForCommit()
 {
     return loader().prepareForCommit();
 }
 
 SecurityContext* LocalFrame::securityContext() const
 {
@@ skipping 359 matching lines @@
     return layerTree ? layerTree->toPrettyJSONString() : String();
 }
 
 bool LocalFrame::shouldThrottleRendering() const
 {
     return view() && view()->shouldThrottleRendering();
 }
 
 inline LocalFrame::LocalFrame(FrameLoaderClient* client, FrameHost* host, FrameOwner* owner, ServiceRegistry* serviceRegistry)
     : Frame(client, host, owner)
+    , m_frameScheduler(page()->chromeClient().createFrameScheduler(client->frameBlameContext()))
     , m_loader(this)
     , m_navigationScheduler(NavigationScheduler::create(this))
     , m_script(ScriptController::create(this))
     , m_editor(Editor::create(*this))
     , m_spellChecker(SpellChecker::create(*this))
     , m_selection(FrameSelection::create(this))
     , m_eventHandler(new EventHandler(this))
     , m_console(FrameConsole::create(*this))
     , m_inputMethodController(InputMethodController::create(*this))
     , m_navigationDisableCount(0)
     , m_pageZoomFactor(parentPageZoomFactor(this))
     , m_textZoomFactor(parentTextZoomFactor(this))
     , m_inViewSourceMode(false)
     , m_serviceRegistry(serviceRegistry)
 {
     if (isLocalRoot())
         m_instrumentingAgents = new InstrumentingAgents();
     else
         m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents;
 }
 
 WebFrameScheduler* LocalFrame::frameScheduler()
 {
-    if (!m_frameScheduler.get())
-        m_frameScheduler = page()->chromeClient().createFrameScheduler(client()->frameBlameContext());
-
-    ASSERT(m_frameScheduler.get());
     return m_frameScheduler.get();
 }
 
 void LocalFrame::scheduleVisualUpdateUnlessThrottled()
 {
     if (shouldThrottleRendering())
         return;
     page()->animator().scheduleVisualUpdate(this);
 }
 
@@ skipping 29 matching lines @@
         m_frame->client()->frameBlameContext()->Enter();
 }
 
 ScopedFrameBlamer::~ScopedFrameBlamer()
 {
     if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
         m_frame->client()->frameBlameContext()->Leave();
 }
 
 } // namespace blink