Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(333)

Unified Diff: third_party/WebKit/Source/core/frame/LocalDOMWindow.h

Issue 2626403002: Move Frame pointer to be held by DOMWindow base class. (Closed)
Patch Set: . Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/frame/LocalDOMWindow.h
diff --git a/third_party/WebKit/Source/core/frame/LocalDOMWindow.h b/third_party/WebKit/Source/core/frame/LocalDOMWindow.h
index 337297b66cc1913bf89b0ec298fdb396df8d02d9..ad9a4cbb8e7fa060c948778a102e3b9474406ed7 100644
--- a/third_party/WebKit/Source/core/frame/LocalDOMWindow.h
+++ b/third_party/WebKit/Source/core/frame/LocalDOMWindow.h
@@ -82,6 +82,8 @@ class CORE_EXPORT LocalDOMWindow final : public DOMWindow,
~LocalDOMWindow() override;
+ LocalFrame* frame() const { return toLocalFrame(DOMWindow::frame()); }
+
DECLARE_VIRTUAL_TRACE();
DECLARE_VIRTUAL_TRACE_WRAPPERS();
@@ -95,7 +97,6 @@ class CORE_EXPORT LocalDOMWindow final : public DOMWindow,
LocalDOMWindow* toLocalDOMWindow() override;
// DOMWindow overrides:
- LocalFrame* frame() const override;
Screen* screen() const override;
History* history() const override;
BarProp* locationbar() const override;
@@ -260,7 +261,6 @@ class CORE_EXPORT LocalDOMWindow final : public DOMWindow,
void willDetachFrameHost();
- Member<LocalFrame> m_frame;
Member<Document> m_document;
Member<DOMVisualViewport> m_visualViewport;
TaskRunnerTimer<LocalDOMWindow> m_unusedPreloadsTimer;

Powered by Google App Engine
This is Rietveld 408576698