Make sure pages that are closing but not yet closed are still suspended.

third_party/WebKit/Source/core/page/Page.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All
  * Rights Reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 44 matching lines @@
 #include "core/paint/PaintLayer.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/plugins/PluginData.h"
 #include "public/platform/Platform.h"
 
 namespace blink {
 
 // Set of all live pages; includes internal Page objects that are
 // not observable from scripts.
 static Page::PageSet& allPages() {
-  DEFINE_STATIC_LOCAL(Page::PageSet, allPages, ());
-  return allPages;
+  DEFINE_STATIC_LOCAL(Page::PageSet, pages, ());
+  return pages;
 }
 
 Page::PageSet& Page::ordinaryPages() {
-  DEFINE_STATIC_LOCAL(Page::PageSet, ordinaryPages, ());
-  return ordinaryPages;
+  DEFINE_STATIC_LOCAL(Page::PageSet, pages, ());
+  return pages;
 }
 
 void Page::networkStateChanged(bool online) {
   HeapVector<Member<LocalFrame>> frames;
 
   // Get all the frames of all the pages in all the page groups
   for (Page* page : allPages()) {
     for (Frame* frame = page->mainFrame(); frame;
          frame = frame->tree().traverseNext()) {
       // FIXME: There is currently no way to dispatch events to out-of-process
@@ skipping 60 matching lines @@
 
   ASSERT(!allPages().contains(this));
   allPages().add(this);
 }
 
 Page::~Page() {
   // willBeDestroyed() must be called before Page destruction.
   ASSERT(!m_mainFrame);
 }
 
+void Page::closeSoon() {
+  // Make sure this Page can no longer be found by JS.
+  m_isClosing = true;
+
+  // TODO(dcheng): Try to remove this in a followup, it's not obviously needed.
+  if (m_mainFrame->isLocalFrame())
+    toLocalFrame(m_mainFrame)->loader().stopAllLoaders();
+
+  chromeClient().closeWindowSoon();
+}
+
 ViewportDescription Page::viewportDescription() const {
   return mainFrame() && mainFrame()->isLocalFrame() &&
                  deprecatedLocalMainFrame()->document()
              ? deprecatedLocalMainFrame()->document()->viewportDescription()
              : ViewportDescription();
 }
 
 ScrollingCoordinator* Page::scrollingCoordinator() {
   if (!m_scrollingCoordinator && m_settings->acceleratedCompositingEnabled())
     m_scrollingCoordinator = ScrollingCoordinator::create(this);
@@ skipping 338 matching lines @@
 void Page::layerTreeViewInitialized(WebLayerTreeView& layerTreeView) {
   if (scrollingCoordinator())
     scrollingCoordinator()->layerTreeViewInitialized(layerTreeView);
 }
 
 void Page::willCloseLayerTreeView(WebLayerTreeView& layerTreeView) {
   if (m_scrollingCoordinator)
     m_scrollingCoordinator->willCloseLayerTreeView(layerTreeView);
 }
 
-void Page::willBeClosed() {
-  ordinaryPages().remove(this);
-}
-
 void Page::willBeDestroyed() {
   Frame* mainFrame = m_mainFrame;
 
   mainFrame->detach(FrameDetachType::Remove);
 
   ASSERT(allPages().contains(this));
   allPages().remove(this);
   ordinaryPages().remove(this);
 
   if (m_scrollingCoordinator)
@@ skipping 11 matching lines @@
     : chromeClient(nullptr),
       contextMenuClient(nullptr),
       editorClient(nullptr),
       spellCheckerClient(nullptr) {}
 
 Page::PageClients::~PageClients() {}
 
 template class CORE_TEMPLATE_EXPORT Supplement<Page>;
 
 }  // namespace blink