Cleanup various WebView/WebFrame APIs to properly handle remote frames.

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 106 matching lines @@
     , m_animator(this)
     , m_autoscrollController(AutoscrollController::create(*this))
     , m_chrome(Chrome::create(this, 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_inspectorController(InspectorController::create(this, pageClients.inspectorClient))
     , m_pointerLockController(PointerLockController::create(this))
     , m_undoStack(UndoStack::create())
+    , m_mainFrame(0)
     , m_backForwardClient(pageClients.backForwardClient)
     , m_editorClient(pageClients.editorClient)
     , m_spellCheckerClient(pageClients.spellCheckerClient)
     , m_storageClient(pageClients.storageClient)
     , m_subframeCount(0)
     , m_openedByDOM(false)
     , m_tabKeyCyclesThroughElements(true)
     , m_defersLoading(false)
     , m_deviceScaleFactor(1)
     , m_timerAlignmentInterval(DOMTimer::visiblePageAlignmentInterval())
     , m_visibilityState(PageVisibilityStateVisible)
     , m_isCursorVisible(true)
 #ifndef NDEBUG
     , m_isPainting(false)
 #endif
     , m_frameHost(FrameHost::create(*this))
 {
     ASSERT(m_editorClient);
 
     ASSERT(!allPages().contains(this));
     allPages().add(this);
 
 #ifndef NDEBUG
     pageCounter.increment();
 #endif
 }
 
 Page::~Page()
 {
+    // willBeDestroyed() must be called before Page destruction.
+    ASSERT(!m_mainFrame);
 }
 
 void Page::makeOrdinary()
 {
     ASSERT(!ordinaryPages().contains(this));
     ordinaryPages().add(this);
 }
 
 ViewportDescription Page::viewportDescription() const
 {
@@ skipping 24 matching lines @@
     Vector<IntRect> rects;
     if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
         rects = scrollingCoordinator->computeShouldHandleScrollGestureOnMainThreadRegion(frame, IntPoint()).rects();
 
     Vector<FloatQuad> quads(rects.size());
     for (size_t i = 0; i < rects.size(); ++i)
         quads[i] = FloatRect(rects[i]);
     return ClientRectList::create(quads);
 }
 
-void Page::setMainFrame(PassRefPtr<Frame> mainFrame)
+void Page::setMainFrame(Frame* mainFrame)
 {
     ASSERT(!m_mainFrame); // Should only be called during initialization
     m_mainFrame = mainFrame;
 }
 
 void Page::documentDetached(Document* document)
 {
     m_multisamplingChangedObservers.clear();
     m_pointerLockController->documentDetached(document);
     m_contextMenuController->documentDetached(document);
@@ skipping 164 matching lines @@
         deprecatedLocalMainFrame()->deviceOrPageScaleFactorChanged();
         m_chrome->client().deviceOrPageScaleFactorChanged();
     }
 }
 
 void Page::allVisitedStateChanged()
 {
     HashSet<Page*>::iterator pagesEnd = ordinaryPages().end();
     for (HashSet<Page*>::iterator it = ordinaryPages().begin(); it != pagesEnd; ++it) {
         Page* page = *it;
-        for (Frame* frame = page->m_mainFrame.get(); frame; frame = frame->tree().traverseNext()) {
+        for (Frame* frame = page->m_mainFrame; frame; frame = frame->tree().traverseNext()) {
             if (frame->isLocalFrame())
                 toLocalFrame(frame)->document()->visitedLinkState().invalidateStyleForAllLinks();
         }
     }
 }
 
 void Page::visitedStateChanged(LinkHash linkHash)
 {
     HashSet<Page*>::iterator pagesEnd = ordinaryPages().end();
     for (HashSet<Page*>::iterator it = ordinaryPages().begin(); it != pagesEnd; ++it) {
         Page* page = *it;
-        for (Frame* frame = page->m_mainFrame.get(); frame; frame = frame->tree().traverseNext()) {
+        for (Frame* frame = page->m_mainFrame; frame; frame = frame->tree().traverseNext()) {
             if (frame->isLocalFrame())
                 toLocalFrame(frame)->document()->visitedLinkState().invalidateStyleForLink(linkHash);
         }
     }
 }
 
 StorageNamespace* Page::sessionStorage(bool optionalCreate)
 {
     if (!m_sessionStorage && optionalCreate)
         m_sessionStorage = m_storageClient->createSessionStorageNamespace();
@@ skipping 189 matching lines @@
     visitor->trace(m_pointerLockController);
     visitor->trace(m_undoStack);
     visitor->trace(m_validationMessageClient);
     visitor->trace(m_multisamplingChangedObservers);
     visitor->trace(m_frameHost);
     WillBeHeapSupplementable<Page>::trace(visitor);
 }
 
 void Page::willBeDestroyed()
 {
-    if (m_mainFrame && m_mainFrame->isLocalFrame())
-        deprecatedLocalMainFrame()->loader().frameDetached();
+    RefPtr<Frame> mainFrame = m_mainFrame;
+
+    if (mainFrame->isLocalFrame())
+        toLocalFrame(mainFrame.get())->loader().frameDetached();
 
     // Disable all agents prior to resetting the frame view.
     m_inspectorController->willBeDestroyed();
 
-    if (m_mainFrame->isLocalFrame()) {
-        toLocalFrame(m_mainFrame.get())->setView(nullptr);
+    if (mainFrame->isLocalFrame()) {
+        toLocalFrame(mainFrame.get())->setView(nullptr);
     } else {
         ASSERT(m_mainFrame->isRemoteFrame());
-        toRemoteFrame(m_mainFrame.get())->setView(nullptr);
+        toRemoteFrame(mainFrame.get())->setView(nullptr);
     }
 
     allPages().remove(this);
     if (ordinaryPages().contains(this))
         ordinaryPages().remove(this);
 
     if (m_scrollingCoordinator)
         m_scrollingCoordinator->willBeDestroyed();
 
 #ifndef NDEBUG
     pageCounter.decrement();
 #endif
 
     m_chrome->willBeDestroyed();
-    m_mainFrame.clear();
+    m_mainFrame = 0;
     if (m_validationMessageClient)
         m_validationMessageClient->willBeDestroyed();
     WillBeHeapSupplementable<Page>::willBeDestroyed();
 }
 
 Page::PageClients::PageClients()
     : chromeClient(0)
     , contextMenuClient(0)
     , editorClient(0)
     , dragClient(0)
     , inspectorClient(0)
     , backForwardClient(0)
     , spellCheckerClient(0)
     , storageClient(0)
 {
 }
 
 Page::PageClients::~PageClients()
 {
 }
 
 } // namespace WebCore