Clarify ordinary page handling.

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.
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 36 matching lines @@
 #include "core/page/PointerLockController.h"
 #include "core/page/ValidationMessageClient.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "core/paint/PaintLayer.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/plugins/PluginData.h"
 #include "public/platform/Platform.h"
 
 namespace blink {
 
-// static
-WillBePersistentHeapHashSet<RawPtrWillBeWeakMember<Page>>& Page::allPages()
+// Set of all live pages; includes internal Page objects that are
+// not observable from scripts.
+static Page::PageSet& allPages()
 {
-    DEFINE_STATIC_LOCAL(WillBePersistentHeapHashSet<RawPtrWillBeWeakMember<Page>>, allPages, ());
+    DEFINE_STATIC_LOCAL(Page::PageSet, allPages, ());
     return allPages;
 }
 
-// static
-WillBePersistentHeapHashSet<RawPtrWillBeWeakMember<Page>>& Page::ordinaryPages()
+Page::PageSet& Page::ordinaryPages()
 {
-    DEFINE_STATIC_LOCAL(WillBePersistentHeapHashSet<RawPtrWillBeWeakMember<Page>>, ordinaryPages, ());
+    DEFINE_STATIC_LOCAL(Page::PageSet, ordinaryPages, ());
     return ordinaryPages;
 }
 
 void Page::networkStateChanged(bool online)
 {
     WillBeHeapVector<RefPtrWillBeMember<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 frames.
             if (frame->isLocalFrame())
                 frames.append(toLocalFrame(frame));
         }
     }
 
     AtomicString eventName = online ? EventTypeNames::online : EventTypeNames::offline;
-    for (unsigned i = 0; i < frames.size(); i++) {
-        frames[i]->domWindow()->dispatchEvent(Event::create(eventName));
-        InspectorInstrumentation::networkStateChanged(frames[i].get(), online);
+    for (const auto& frame : frames) {
+        frame->domWindow()->dispatchEvent(Event::create(eventName));
+        InspectorInstrumentation::networkStateChanged(frame.get(), online);
     }
 }
 
 void Page::onMemoryPressure()
 {
-    for (auto& page : ordinaryPages())
+    for (Page* page : ordinaryPages())
         page->memoryPurgeController().purgeMemory();
 }
 
 float deviceScaleFactor(LocalFrame* frame)
 {
     if (!frame)
         return 1;
     Page* page = frame->page();
     if (!page)
         return 1;
     return page->deviceScaleFactor();
 }
 
+PassOwnPtrWillBeRawPtr<Page> Page::createOrdinary(PageClients& pageClients)
+{
+    OwnPtrWillBeRawPtr<Page> page = create(pageClients);
+    ordinaryPages().add(page.get());
+    page->memoryPurgeController().registerClient(page.get());
+    return page.release();
+}
+
 Page::Page(PageClients& pageClients)
     : SettingsDelegate(Settings::create())
     , m_animator(PageAnimator::create(*this))
     , m_autoscrollController(AutoscrollController::create(*this))
     , m_chromeClient(pageClients.chromeClient)
     , m_dragCaretController(DragCaretController::create())
     , m_dragController(DragController::create(this, pageClients.dragClient))
     , m_focusController(FocusController::create(this))
     , m_contextMenuController(ContextMenuController::create(this, pageClients.contextMenuClient))
     , m_pointerLockController(PointerLockController::create(this))
@@ skipping 14 matching lines @@
 {
     ASSERT(m_editorClient);
 
     ASSERT(!allPages().contains(this));
     allPages().add(this);
 }
 
 Page::~Page()
 {
 #if !ENABLE(OILPAN)
     ASSERT(!ordinaryPages().contains(this));

[haraken, 2016/01/03 15:43:19]

I'm curious why we can't enable the ASSERT in oilpan?

[sof, 2016/01/03 15:58:19]

It would be valid to test for it if LEAK_SANITIZER isn't in effect (=>
persistent singletons aren't released during shutdown.)

(I don't mind much either way, but the test coverage elsewhere wrt Oilpan's
handling of weak references, is pretty good by now.)

 #endif
     // willBeDestroyed() must be called before Page destruction.
     ASSERT(!m_mainFrame);
 }
 
-void Page::makeOrdinary()
-{
-    ASSERT(!ordinaryPages().contains(this));
-    ordinaryPages().add(this);
-    memoryPurgeController().registerClient(this);
-}
-
 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 382 matching lines @@
     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()
 {
     RefPtrWillBeRawPtr<Frame> mainFrame = m_mainFrame;
 
     mainFrame->detach(FrameDetachType::Remove);
 
     ASSERT(allPages().contains(this));
     allPages().remove(this);
     ordinaryPages().remove(this);
 #if !ENABLE(OILPAN)
     if (m_memoryPurgeController)
         m_memoryPurgeController->unregisterClient(this);
 #endif
 
     if (m_scrollingCoordinator)
         m_scrollingCoordinator->willBeDestroyed();
 
     chromeClient().chromeDestroyed();
     if (m_validationMessageClient)
         m_validationMessageClient->willBeDestroyed();
     m_mainFrame = nullptr;
 
-    Page::notifyContextDestroyed();
+    PageLifecycleNotifier::notifyContextDestroyed();
 }
 
 Page::PageClients::PageClients()
     : chromeClient(nullptr)
     , contextMenuClient(nullptr)
     , editorClient(nullptr)
     , dragClient(nullptr)
     , spellCheckerClient(nullptr)
 {
 }
 
 Page::PageClients::~PageClients()
 {
 }
 
 template class CORE_TEMPLATE_EXPORT WillBeHeapSupplement<Page>;
 
 } // namespace blink