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

Side by Side Diff: Source/core/frame/LocalFrame.h

Issue 1532413002: Added Dartium changes onto 45.0.2454.104 (Closed) Base URL: http://src.chromium.org/blink/branches/chromium/2454
Patch Set: Created 5 years 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
« no previous file with comments | « Source/core/dom/ScriptLoader.cpp ('k') | Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999-2001 Lars Knoll <knoll@kde.org> 3 * 1999-2001 Lars Knoll <knoll@kde.org>
4 * 1999-2001 Antti Koivisto <koivisto@kde.org> 4 * 1999-2001 Antti Koivisto <koivisto@kde.org>
5 * 2000-2001 Simon Hausmann <hausmann@kde.org> 5 * 2000-2001 Simon Hausmann <hausmann@kde.org>
6 * 2000-2001 Dirk Mueller <mueller@kde.org> 6 * 2000-2001 Dirk Mueller <mueller@kde.org>
7 * 2000 Stefan Schimanski <1Stein@gmx.de> 7 * 2000 Stefan Schimanski <1Stein@gmx.de>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
9 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 10 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
(...skipping 28 matching lines...) Expand all
39 #include "platform/Supplementable.h" 39 #include "platform/Supplementable.h"
40 #include "platform/graphics/ImageOrientation.h" 40 #include "platform/graphics/ImageOrientation.h"
41 #include "platform/graphics/paint/DisplayItem.h" 41 #include "platform/graphics/paint/DisplayItem.h"
42 #include "platform/heap/Handle.h" 42 #include "platform/heap/Handle.h"
43 #include "platform/scroll/ScrollTypes.h" 43 #include "platform/scroll/ScrollTypes.h"
44 #include "wtf/HashSet.h" 44 #include "wtf/HashSet.h"
45 45
46 namespace blink { 46 namespace blink {
47 47
48 class Color; 48 class Color;
49 class DartController;
49 class Document; 50 class Document;
50 class DragImage; 51 class DragImage;
51 class Editor; 52 class Editor;
52 class Element; 53 class Element;
53 class EventHandler; 54 class EventHandler;
54 class FloatSize; 55 class FloatSize;
55 class FrameConsole; 56 class FrameConsole;
56 class FrameSelection; 57 class FrameSelection;
57 class FrameView; 58 class FrameView;
58 class HTMLPlugInElement; 59 class HTMLPlugInElement;
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 109
109 LayoutView* contentLayoutObject() const; // Root of the layout tree for the document contained in this frame. 110 LayoutView* contentLayoutObject() const; // Root of the layout tree for the document contained in this frame.
110 111
111 Editor& editor() const; 112 Editor& editor() const;
112 EventHandler& eventHandler() const; 113 EventHandler& eventHandler() const;
113 FrameLoader& loader() const; 114 FrameLoader& loader() const;
114 NavigationScheduler& navigationScheduler() const; 115 NavigationScheduler& navigationScheduler() const;
115 FrameSelection& selection() const; 116 FrameSelection& selection() const;
116 InputMethodController& inputMethodController() const; 117 InputMethodController& inputMethodController() const;
117 ScriptController& script() const; 118 ScriptController& script() const;
119 DartController& dart();
118 SpellChecker& spellChecker() const; 120 SpellChecker& spellChecker() const;
119 FrameConsole& console() const; 121 FrameConsole& console() const;
120 122
121 void didChangeVisibilityState(); 123 void didChangeVisibilityState();
122 124
123 // This method is used to get the highest level LocalFrame in this 125 // This method is used to get the highest level LocalFrame in this
124 // frame's in-process subtree. 126 // frame's in-process subtree.
125 // FIXME: This is a temporary hack to support RemoteFrames, and callers 127 // FIXME: This is a temporary hack to support RemoteFrames, and callers
126 // should be updated to avoid storing things on the main frame. 128 // should be updated to avoid storing things on the main frame.
127 LocalFrame* localFrameRoot(); 129 LocalFrame* localFrameRoot();
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 194
193 mutable FrameLoader m_loader; 195 mutable FrameLoader m_loader;
194 mutable NavigationScheduler m_navigationScheduler; 196 mutable NavigationScheduler m_navigationScheduler;
195 197
196 RefPtrWillBeMember<FrameView> m_view; 198 RefPtrWillBeMember<FrameView> m_view;
197 RefPtrWillBeMember<LocalDOMWindow> m_domWindow; 199 RefPtrWillBeMember<LocalDOMWindow> m_domWindow;
198 // Usually 0. Non-null if this is the top frame of PagePopup. 200 // Usually 0. Non-null if this is the top frame of PagePopup.
199 RefPtrWillBeMember<Element> m_pagePopupOwner; 201 RefPtrWillBeMember<Element> m_pagePopupOwner;
200 202
201 const OwnPtrWillBeMember<ScriptController> m_script; 203 const OwnPtrWillBeMember<ScriptController> m_script;
204 OwnPtr<DartController> m_dart;
202 const OwnPtrWillBeMember<Editor> m_editor; 205 const OwnPtrWillBeMember<Editor> m_editor;
203 const OwnPtrWillBeMember<SpellChecker> m_spellChecker; 206 const OwnPtrWillBeMember<SpellChecker> m_spellChecker;
204 const OwnPtrWillBeMember<FrameSelection> m_selection; 207 const OwnPtrWillBeMember<FrameSelection> m_selection;
205 const OwnPtrWillBeMember<EventHandler> m_eventHandler; 208 const OwnPtrWillBeMember<EventHandler> m_eventHandler;
206 const OwnPtrWillBeMember<FrameConsole> m_console; 209 const OwnPtrWillBeMember<FrameConsole> m_console;
207 const OwnPtrWillBeMember<InputMethodController> m_inputMethodController; 210 const OwnPtrWillBeMember<InputMethodController> m_inputMethodController;
208 211
209 #if ENABLE(OILPAN) 212 #if ENABLE(OILPAN)
210 // Oilpan: in order to reliably finalize plugin elements with 213 // Oilpan: in order to reliably finalize plugin elements with
211 // renderer-less plugins, the frame keeps track of them. When 214 // renderer-less plugins, the frame keeps track of them. When
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 inline FrameView* LocalFrame::view() const 257 inline FrameView* LocalFrame::view() const
255 { 258 {
256 return m_view.get(); 259 return m_view.get();
257 } 260 }
258 261
259 inline ScriptController& LocalFrame::script() const 262 inline ScriptController& LocalFrame::script() const
260 { 263 {
261 return *m_script; 264 return *m_script;
262 } 265 }
263 266
267 inline DartController& LocalFrame::dart()
268 {
269 return *m_dart;
270 }
271
264 inline FrameSelection& LocalFrame::selection() const 272 inline FrameSelection& LocalFrame::selection() const
265 { 273 {
266 return *m_selection; 274 return *m_selection;
267 } 275 }
268 276
269 inline Editor& LocalFrame::editor() const 277 inline Editor& LocalFrame::editor() const
270 { 278 {
271 return *m_editor; 279 return *m_editor;
272 } 280 }
273 281
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 314
307 DECLARE_WEAK_IDENTIFIER_MAP(LocalFrame); 315 DECLARE_WEAK_IDENTIFIER_MAP(LocalFrame);
308 } // namespace blink 316 } // namespace blink
309 317
310 // During refactoring, there are some places where we need to do type conversion s that 318 // During refactoring, there are some places where we need to do type conversion s that
311 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte d out. 319 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte d out.
312 // At that time this #define will be removed and all the uses of it will need to be corrected. 320 // At that time this #define will be removed and all the uses of it will need to be corrected.
313 #define toLocalFrameTemporary toLocalFrame 321 #define toLocalFrameTemporary toLocalFrame
314 322
315 #endif // LocalFrame_h 323 #endif // LocalFrame_h
OLDNEW
« no previous file with comments | « Source/core/dom/ScriptLoader.cpp ('k') | Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698