Change Page::m_mainFrame to be a Frame.

Source/core/page/Page.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #ifndef Page_h
 #define Page_h
 
 #include "core/dom/ViewportDescription.h"
+#include "core/frame/LocalFrame.h"
 #include "core/frame/SettingsDelegate.h"
 #include "core/frame/UseCounter.h"
 #include "core/page/PageAnimator.h"
 #include "core/page/PageVisibilityState.h"
 #include "platform/LifecycleContext.h"
 #include "platform/Supplementable.h"
 #include "platform/geometry/LayoutRect.h"
 #include "platform/geometry/Region.h"
 #include "platform/heap/Handle.h"
 #include "wtf/Forward.h"
 #include "wtf/HashSet.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
 class AutoscrollController;
 class BackForwardClient;
 class Chrome;
 class ChromeClient;
 class ClientRectList;
 class ContextMenuClient;
 class ContextMenuController;
 class Document;
 class DragCaretController;
 class DragClient;
 class DragController;
 class EditorClient;
 class FocusController;
-class LocalFrame;
+class Frame;
 class FrameHost;
 class HistoryItem;
 class InspectorClient;
 class InspectorController;
 class PageLifecycleNotifier;
 class PlatformMouseEvent;
 class PluginData;
 class PointerLockController;
 class Range;
 class RenderBox;
@@ skipping 55 matching lines @@
 
     ViewportDescription viewportDescription() const;
 
     static void refreshPlugins(bool reload);
     PluginData* pluginData() const;
 
     EditorClient& editorClient() const { return *m_editorClient; }
     SpellCheckerClient& spellCheckerClient() const { return *m_spellCheckerClient; }
     UndoStack& undoStack() const { return *m_undoStack; }
 
-    void setMainFrame(PassRefPtr<LocalFrame>);
-    LocalFrame* mainFrame() const { return m_mainFrame.get(); }
+    void setMainFrame(PassRefPtr<Frame>);
+    Frame* mainFrame() const { return m_mainFrame.get(); }
+    LocalFrame* deprecatedLocalMainFrame() const { return toLocalFrame(m_mainFrame.get()); }

[abarth-chromium, 2014/06/15 03:46:15]

I would probably add a comment explaining why this function is deprecated and
what someone should do instead of calling it.

[dcheng, 2014/06/15 05:05:43]

Done.

 
     void documentDetached(Document*);
 
     bool openedByDOM() const;
     void setOpenedByDOM();
 
     void incrementSubframeCount() { ++m_subframeCount; }
     void decrementSubframeCount() { ASSERT(m_subframeCount); --m_subframeCount; }
     int subframeCount() const { checkSubframeCountConsistency(); return m_subframeCount; }
 
@@ skipping 103 matching lines @@
     const OwnPtr<Chrome> m_chrome;
     const OwnPtrWillBeMember<DragCaretController> m_dragCaretController;
     const OwnPtrWillBeMember<DragController> m_dragController;
     const OwnPtr<FocusController> m_focusController;
     const OwnPtr<ContextMenuController> m_contextMenuController;
     const OwnPtr<InspectorController> m_inspectorController;
     const OwnPtrWillBeMember<PointerLockController> m_pointerLockController;
     OwnPtr<ScrollingCoordinator> m_scrollingCoordinator;
     const OwnPtr<UndoStack> m_undoStack;
 
-    RefPtr<LocalFrame> m_mainFrame;
+    RefPtr<Frame> m_mainFrame;
 
     mutable RefPtr<PluginData> m_pluginData;
 
     BackForwardClient* m_backForwardClient;
     EditorClient* const m_editorClient;
     SpellCheckerClient* const m_spellCheckerClient;
     StorageClient* m_storageClient;
     OwnPtr<ValidationMessageClient> m_validationMessageClient;
 
     UseCounter m_useCounter;
@@ skipping 21 matching lines @@
     WillBeHeapHashSet<RawPtrWillBeWeakMember<MultisamplingChangedObserver> > m_multisamplingChangedObservers;
 
     // A pointer to all the interfaces provided to in-process Frames for this Page.
     // FIXME: Most of the members of Page should move onto FrameHost.
     OwnPtrWillBeMember<FrameHost> m_frameHost;
 };
 
 } // namespace WebCore
 
 #endif // Page_h