| OLD | NEW |
| 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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 | 156 |
| 157 String localLayerTreeAsText(unsigned flags) const; | 157 String localLayerTreeAsText(unsigned flags) const; |
| 158 | 158 |
| 159 mutable FrameTree m_treeNode; | 159 mutable FrameTree m_treeNode; |
| 160 mutable FrameLoader m_loader; | 160 mutable FrameLoader m_loader; |
| 161 mutable NavigationScheduler m_navigationScheduler; | 161 mutable NavigationScheduler m_navigationScheduler; |
| 162 | 162 |
| 163 RefPtr<FrameView> m_view; | 163 RefPtr<FrameView> m_view; |
| 164 | 164 |
| 165 OwnPtr<ScriptController> m_script; | 165 OwnPtr<ScriptController> m_script; |
| 166 const OwnPtr<Editor> m_editor; | 166 const OwnPtrWillBePersistent<Editor> m_editor; |
| 167 const OwnPtr<SpellChecker> m_spellChecker; | 167 const OwnPtr<SpellChecker> m_spellChecker; |
| 168 const OwnPtr<FrameSelection> m_selection; | 168 const OwnPtrWillBePersistent<FrameSelection> m_selection; |
| 169 const OwnPtr<EventHandler> m_eventHandler; | 169 const OwnPtr<EventHandler> m_eventHandler; |
| 170 const OwnPtr<FrameConsole> m_console; | 170 const OwnPtr<FrameConsole> m_console; |
| 171 OwnPtr<InputMethodController> m_inputMethodController; | 171 OwnPtr<InputMethodController> m_inputMethodController; |
| 172 | 172 |
| 173 float m_pageZoomFactor; | 173 float m_pageZoomFactor; |
| 174 float m_textZoomFactor; | 174 float m_textZoomFactor; |
| 175 | 175 |
| 176 bool m_inViewSourceMode; | 176 bool m_inViewSourceMode; |
| 177 }; | 177 }; |
| 178 | 178 |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, localFrame->isLocalFrame(),
localFrame.isLocalFrame()); | 250 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, localFrame->isLocalFrame(),
localFrame.isLocalFrame()); |
| 251 | 251 |
| 252 } // namespace WebCore | 252 } // namespace WebCore |
| 253 | 253 |
| 254 // During refactoring, there are some places where we need to do type conversion
s that | 254 // During refactoring, there are some places where we need to do type conversion
s that |
| 255 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte
d out. | 255 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte
d out. |
| 256 // At that time this #define will be removed and all the uses of it will need to
be corrected. | 256 // At that time this #define will be removed and all the uses of it will need to
be corrected. |
| 257 #define toLocalFrameTemporary toLocalFrame | 257 #define toLocalFrameTemporary toLocalFrame |
| 258 | 258 |
| 259 #endif // LocalFrame_h | 259 #endif // LocalFrame_h |
| OLD | NEW |