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

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

Issue 517213003: Oilpan: fix build after r181083 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Re-intro ~FrameConsole non-Oilpan Created 6 years, 3 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/FrameConsole.cpp ('k') | Source/core/inspector/ConsoleMessageStorage.h » ('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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 168
169 RefPtr<FrameView> m_view; 169 RefPtr<FrameView> m_view;
170 // Usually 0. Non-null if this is the top frame of PagePopup. 170 // Usually 0. Non-null if this is the top frame of PagePopup.
171 RefPtrWillBePersistent<Element> m_pagePopupOwner; 171 RefPtrWillBePersistent<Element> m_pagePopupOwner;
172 172
173 OwnPtr<ScriptController> m_script; 173 OwnPtr<ScriptController> m_script;
174 const OwnPtrWillBePersistent<Editor> m_editor; 174 const OwnPtrWillBePersistent<Editor> m_editor;
175 const OwnPtr<SpellChecker> m_spellChecker; 175 const OwnPtr<SpellChecker> m_spellChecker;
176 const OwnPtrWillBePersistent<FrameSelection> m_selection; 176 const OwnPtrWillBePersistent<FrameSelection> m_selection;
177 const OwnPtrWillBePersistent<EventHandler> m_eventHandler; 177 const OwnPtrWillBePersistent<EventHandler> m_eventHandler;
178 const OwnPtr<FrameConsole> m_console; 178 const OwnPtrWillBePersistent<FrameConsole> m_console;
179 OwnPtr<InputMethodController> m_inputMethodController; 179 OwnPtr<InputMethodController> m_inputMethodController;
180 180
181 float m_pageZoomFactor; 181 float m_pageZoomFactor;
182 float m_textZoomFactor; 182 float m_textZoomFactor;
183 183
184 bool m_inViewSourceMode; 184 bool m_inViewSourceMode;
185 }; 185 };
186 186
187 inline void LocalFrame::init() 187 inline void LocalFrame::init()
188 { 188 {
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, localFrame->isLocalFrame(), localFrame.isLocalFrame()); 253 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, localFrame->isLocalFrame(), localFrame.isLocalFrame());
254 254
255 } // namespace blink 255 } // namespace blink
256 256
257 // During refactoring, there are some places where we need to do type conversion s that 257 // During refactoring, there are some places where we need to do type conversion s that
258 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte d out. 258 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte d out.
259 // At that time this #define will be removed and all the uses of it will need to be corrected. 259 // At that time this #define will be removed and all the uses of it will need to be corrected.
260 #define toLocalFrameTemporary toLocalFrame 260 #define toLocalFrameTemporary toLocalFrame
261 261
262 #endif // LocalFrame_h 262 #endif // LocalFrame_h
OLDNEW
« no previous file with comments | « Source/core/frame/FrameConsole.cpp ('k') | Source/core/inspector/ConsoleMessageStorage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698