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

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

Issue 189573002: Convert HTMLFrameOwnerElement and FocusController to use Frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Missed a null check Created 6 years, 9 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
« no previous file with comments | « Source/core/frame/Frame.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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 void init(); 66 void init();
67 void setView(PassRefPtr<FrameView>); 67 void setView(PassRefPtr<FrameView>);
68 void createView(const IntSize&, const Color&, bool, 68 void createView(const IntSize&, const Color&, bool,
69 ScrollbarMode = ScrollbarAuto, bool horizontalLock = false, 69 ScrollbarMode = ScrollbarAuto, bool horizontalLock = false,
70 ScrollbarMode = ScrollbarAuto, bool verticalLock = false); 70 ScrollbarMode = ScrollbarAuto, bool verticalLock = false);
71 71
72 virtual ~LocalFrame(); 72 virtual ~LocalFrame();
73 73
74 virtual void willDetachFrameHost() OVERRIDE; 74 virtual void willDetachFrameHost() OVERRIDE;
75 virtual void detachFromFrameHost() OVERRIDE; 75 virtual void detachFromFrameHost() OVERRIDE;
76 void disconnectOwnerElement();
77
78 HTMLFrameOwnerElement* ownerElement() const;
79 76
80 virtual void setDOMWindow(PassRefPtrWillBeRawPtr<DOMWindow>) OVERRIDE; 77 virtual void setDOMWindow(PassRefPtrWillBeRawPtr<DOMWindow>) OVERRIDE;
81 FrameView* view() const; 78 FrameView* view() const;
82 79
83 Editor& editor() const; 80 Editor& editor() const;
84 EventHandler& eventHandler() const; 81 EventHandler& eventHandler() const;
85 FrameLoader& loader() const; 82 FrameLoader& loader() const;
86 FrameTree& tree() const; 83 FrameTree& tree() const;
87 NavigationScheduler& navigationScheduler() const; 84 NavigationScheduler& navigationScheduler() const;
88 FrameSelection& selection() const; 85 FrameSelection& selection() const;
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 inline SpellChecker& LocalFrame::spellChecker() const 205 inline SpellChecker& LocalFrame::spellChecker() const
209 { 206 {
210 return *m_spellChecker; 207 return *m_spellChecker;
211 } 208 }
212 209
213 inline InputMethodController& LocalFrame::inputMethodController() const 210 inline InputMethodController& LocalFrame::inputMethodController() const
214 { 211 {
215 return *m_inputMethodController; 212 return *m_inputMethodController;
216 } 213 }
217 214
218 inline HTMLFrameOwnerElement* LocalFrame::ownerElement() const
219 {
220 return m_ownerElement;
221 }
222
223 inline bool LocalFrame::inViewSourceMode() const 215 inline bool LocalFrame::inViewSourceMode() const
224 { 216 {
225 return m_inViewSourceMode; 217 return m_inViewSourceMode;
226 } 218 }
227 219
228 inline void LocalFrame::setInViewSourceMode(bool mode) 220 inline void LocalFrame::setInViewSourceMode(bool mode)
229 { 221 {
230 m_inViewSourceMode = mode; 222 m_inViewSourceMode = mode;
231 } 223 }
232 224
233 inline FrameTree& LocalFrame::tree() const 225 inline FrameTree& LocalFrame::tree() const
234 { 226 {
235 return m_treeNode; 227 return m_treeNode;
236 } 228 }
237 229
238 inline EventHandler& LocalFrame::eventHandler() const 230 inline EventHandler& LocalFrame::eventHandler() const
239 { 231 {
240 ASSERT(m_eventHandler); 232 ASSERT(m_eventHandler);
241 return *m_eventHandler; 233 return *m_eventHandler;
242 } 234 }
243 235
244 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, localFrame->isLocalFrame(), localFrame.isLocalFrame()); 236 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, localFrame->isLocalFrame(), localFrame.isLocalFrame());
245 237
246 } // namespace WebCore 238 } // namespace WebCore
247 239
240 // During refactoring, there are some places where we need to do type conversion s that
241 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte d out.
242 // At that time this #define will be removed and all the uses of it will need to be corrected.
243 #define toLocalFrameTemporary toLocalFrame
244
248 #endif // LocalFrame_h 245 #endif // LocalFrame_h
OLDNEW
« no previous file with comments | « Source/core/frame/Frame.cpp ('k') | Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698