Index: third_party/WebKit/Source/core/frame/LocalFrame.h |
diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.h b/third_party/WebKit/Source/core/frame/LocalFrame.h |
index 03af3b9113454b72855eedf6cda93993578d4f34..28b9963786cd5e6cf3ef3faa22d0d89a19a68bf8 100644 |
--- a/third_party/WebKit/Source/core/frame/LocalFrame.h |
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.h |
@@ -31,9 +31,12 @@ |
#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" |
@@ -56,14 +59,11 @@ 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; |
@@ -110,7 +110,7 @@ public: |
FrameView* view() const; |
Document* document() const; |
void setPagePopupOwner(Element&); |
- Element* pagePopupOwner() const { return m_pagePopupOwner.get(); } |
+ Element* pagePopupOwner() const; |
LayoutView* contentLayoutObject() const; // Root of the layout tree for the document contained in this frame. |
@@ -263,11 +263,6 @@ inline void LocalFrame::init() |
m_loader.init(); |
} |
-inline LocalDOMWindow* LocalFrame::localDOMWindow() const |
-{ |
- return m_domWindow.get(); |
-} |
- |
inline FrameLoader& LocalFrame::loader() const |
{ |
return m_loader; |