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

Side by Side 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 static Document* createDocument(const String& mimeType, 76 static Document* createDocument(const String& mimeType,
77 const DocumentInit&, 77 const DocumentInit&,
78 bool forceXHTML); 78 bool forceXHTML);
79 static LocalDOMWindow* create(LocalFrame& frame) { 79 static LocalDOMWindow* create(LocalFrame& frame) {
80 return new LocalDOMWindow(frame); 80 return new LocalDOMWindow(frame);
81 } 81 }
82 82
83 ~LocalDOMWindow() override; 83 ~LocalDOMWindow() override;
84 84
85 LocalFrame* frame() const { return toLocalFrame(DOMWindow::frame()); }
86
85 DECLARE_VIRTUAL_TRACE(); 87 DECLARE_VIRTUAL_TRACE();
86 DECLARE_VIRTUAL_TRACE_WRAPPERS(); 88 DECLARE_VIRTUAL_TRACE_WRAPPERS();
87 89
88 Document* installNewDocument(const String& mimeType, 90 Document* installNewDocument(const String& mimeType,
89 const DocumentInit&, 91 const DocumentInit&,
90 bool forceXHTML = false); 92 bool forceXHTML = false);
91 93
92 // EventTarget overrides: 94 // EventTarget overrides:
93 ExecutionContext* getExecutionContext() const override; 95 ExecutionContext* getExecutionContext() const override;
94 const LocalDOMWindow* toLocalDOMWindow() const override; 96 const LocalDOMWindow* toLocalDOMWindow() const override;
95 LocalDOMWindow* toLocalDOMWindow() override; 97 LocalDOMWindow* toLocalDOMWindow() override;
96 98
97 // DOMWindow overrides: 99 // DOMWindow overrides:
98 LocalFrame* frame() const override;
99 Screen* screen() const override; 100 Screen* screen() const override;
100 History* history() const override; 101 History* history() const override;
101 BarProp* locationbar() const override; 102 BarProp* locationbar() const override;
102 BarProp* menubar() const override; 103 BarProp* menubar() const override;
103 BarProp* personalbar() const override; 104 BarProp* personalbar() const override;
104 BarProp* scrollbars() const override; 105 BarProp* scrollbars() const override;
105 BarProp* statusbar() const override; 106 BarProp* statusbar() const override;
106 BarProp* toolbar() const override; 107 BarProp* toolbar() const override;
107 Navigator* navigator() const override; 108 Navigator* navigator() const override;
108 bool offscreenBuffering() const override; 109 bool offscreenBuffering() const override;
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 void warnUnusedPreloads(TimerBase*); 254 void warnUnusedPreloads(TimerBase*);
254 255
255 explicit LocalDOMWindow(LocalFrame&); 256 explicit LocalDOMWindow(LocalFrame&);
256 void dispose(); 257 void dispose();
257 258
258 void dispatchLoadEvent(); 259 void dispatchLoadEvent();
259 void clearDocument(); 260 void clearDocument();
260 261
261 void willDetachFrameHost(); 262 void willDetachFrameHost();
262 263
263 Member<LocalFrame> m_frame;
264 Member<Document> m_document; 264 Member<Document> m_document;
265 Member<DOMVisualViewport> m_visualViewport; 265 Member<DOMVisualViewport> m_visualViewport;
266 TaskRunnerTimer<LocalDOMWindow> m_unusedPreloadsTimer; 266 TaskRunnerTimer<LocalDOMWindow> m_unusedPreloadsTimer;
267 267
268 bool m_shouldPrintWhenFinishedLoading; 268 bool m_shouldPrintWhenFinishedLoading;
269 269
270 HeapHashSet<WeakMember<DOMWindowProperty>> m_properties; 270 HeapHashSet<WeakMember<DOMWindowProperty>> m_properties;
271 271
272 mutable Member<Screen> m_screen; 272 mutable Member<Screen> m_screen;
273 mutable Member<History> m_history; 273 mutable Member<History> m_history;
(...skipping 29 matching lines...) Expand all
303 return m_status; 303 return m_status;
304 } 304 }
305 305
306 inline String LocalDOMWindow::defaultStatus() const { 306 inline String LocalDOMWindow::defaultStatus() const {
307 return m_defaultStatus; 307 return m_defaultStatus;
308 } 308 }
309 309
310 } // namespace blink 310 } // namespace blink
311 311
312 #endif // LocalDOMWindow_h 312 #endif // LocalDOMWindow_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698