Revert of [Oilpan] Prepare full definition of classes before using Member

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

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999-2001 Lars Knoll <knoll@kde.org>
  *                     1999-2001 Antti Koivisto <koivisto@kde.org>
  *                     2000-2001 Simon Hausmann <hausmann@kde.org>
  *                     2000-2001 Dirk Mueller <mueller@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
@@ skipping 13 matching lines @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #ifndef LocalFrame_h
 #define LocalFrame_h
 
 #include "core/CoreExport.h"
 #include "core/dom/WeakIdentifierMap.h"
 #include "core/frame/Frame.h"
-#include "core/frame/FrameView.h"
 #include "core/frame/LocalFrameLifecycleNotifier.h"
 #include "core/frame/LocalFrameLifecycleObserver.h"
-#include "core/inspector/InstrumentingAgents.h"
 #include "core/loader/FrameLoader.h"
-#include "core/loader/NavigationScheduler.h"
 #include "core/page/FrameTree.h"
 #include "core/paint/PaintPhase.h"
 #include "platform/Supplementable.h"
 #include "platform/graphics/ImageOrientation.h"
 #include "platform/graphics/paint/DisplayItem.h"
 #include "platform/heap/Handle.h"
 #include "platform/scroll/ScrollTypes.h"
 #include "wtf/HashSet.h"
 
 namespace blink {
 
 class Color;
 class Document;
 class DragImage;
 class Editor;
 template <typename Traversal> class EditingAlgorithm;
 class Element;
 template <typename Strategy> class EphemeralRangeTemplate;
 class EventHandler;
 class FloatSize;
 class FrameConsole;
 class FrameSelection;
+class FrameView;
 class HTMLPlugInElement;
 class InputMethodController;
 class IntPoint;
 class IntSize;
+class InstrumentingAgents;
 class LocalDOMWindow;
+class NavigationScheduler;
 class Node;
 class NodeTraversal;
 class Range;
 class LayoutView;
 class TreeScope;
 class ScriptController;
 class SpellChecker;
 class TreeScope;
 class WebFrameHostScheduler;
 class WebFrameScheduler;
@@ skipping 26 matching lines @@
     void printNavigationErrorMessage(const Frame&, const char* reason) override;
     bool prepareForCommit() override;
 
     void willDetachFrameHost();
 
     LocalDOMWindow* localDOMWindow() const;
     void setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow>);
     FrameView* view() const;
     Document* document() const;
     void setPagePopupOwner(Element&);
-    Element* pagePopupOwner() const;
+    Element* pagePopupOwner() const { return m_pagePopupOwner.get(); }
 
     LayoutView* contentLayoutObject() const; // Root of the layout tree for the document contained in this frame.
 
     Editor& editor() const;
     EventHandler& eventHandler() const;
     FrameLoader& loader() const;
     NavigationScheduler& navigationScheduler() const;
     FrameSelection& selection() const;
     InputMethodController& inputMethodController() const;
     ScriptController& script() const;
@@ skipping 131 matching lines @@
     // TODO(dcheng): Temporary to try to debug https://crbug.com/531291
     enum class SupplementStatus { Uncleared, Clearing, Cleared };
     SupplementStatus m_supplementStatus = SupplementStatus::Uncleared;
 };
 
 inline void LocalFrame::init()
 {
     m_loader.init();
 }
 
+inline LocalDOMWindow* LocalFrame::localDOMWindow() const
+{
+    return m_domWindow.get();
+}
+
 inline FrameLoader& LocalFrame::loader() const
 {
     return m_loader;
 }
 
 inline NavigationScheduler& LocalFrame::navigationScheduler() const
 {
     ASSERT(m_navigationScheduler);
     return *m_navigationScheduler.get();
 }
@@ skipping 65 matching lines @@
 };
 
 } // namespace blink
 
 // During refactoring, there are some places where we need to do type conversions that
 // will not be needed once all instances of LocalFrame and RemoteFrame are sorted out.
 // At that time this #define will be removed and all the uses of it will need to be corrected.
 #define toLocalFrameTemporary toLocalFrame
 
 #endif // LocalFrame_h