| 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 | 86 |
| 87 RenderView* contentRenderer() const; // Root of the render tree for the
document contained in this frame. | 87 RenderView* contentRenderer() const; // Root of the render tree for the
document contained in this frame. |
| 88 | 88 |
| 89 Editor& editor() const; | 89 Editor& editor() const; |
| 90 EventHandler& eventHandler() const; | 90 EventHandler& eventHandler() const; |
| 91 NewEventHandler& newEventHandler() const; | 91 NewEventHandler& newEventHandler() const; |
| 92 MojoLoader& mojoLoader() const { return *m_mojoLoader; } | 92 MojoLoader& mojoLoader() const { return *m_mojoLoader; } |
| 93 FrameSelection& selection() const; | 93 FrameSelection& selection() const; |
| 94 InputMethodController& inputMethodController() const; | 94 InputMethodController& inputMethodController() const; |
| 95 FetchContext& fetchContext() const; | 95 FetchContext& fetchContext() const; |
| 96 DartController& dart(); | |
| 97 SpellChecker& spellChecker() const; | 96 SpellChecker& spellChecker() const; |
| 98 FrameConsole& console() const; | 97 FrameConsole& console() const; |
| 99 | 98 |
| 100 void didChangeVisibilityState(); | 99 void didChangeVisibilityState(); |
| 101 | 100 |
| 102 FrameLoaderClient* loaderClient() const; | 101 FrameLoaderClient* loaderClient() const; |
| 103 | 102 |
| 104 // ======== All public functions below this point are candidates to move out
of LocalFrame into another class. ======== | 103 // ======== All public functions below this point are candidates to move out
of LocalFrame into another class. ======== |
| 105 | 104 |
| 106 FloatSize resizePageRectsKeepingRatio(const FloatSize& originalSize, con
st FloatSize& expectedSize); | 105 FloatSize resizePageRectsKeepingRatio(const FloatSize& originalSize, con
st FloatSize& expectedSize); |
| (...skipping 13 matching lines...) Expand all Loading... |
| 120 | 119 |
| 121 private: | 120 private: |
| 122 LocalFrame(FrameLoaderClient*, FrameHost*); | 121 LocalFrame(FrameLoaderClient*, FrameHost*); |
| 123 | 122 |
| 124 HashSet<FrameDestructionObserver*> m_destructionObservers; | 123 HashSet<FrameDestructionObserver*> m_destructionObservers; |
| 125 mutable FrameLoader m_deprecatedLoader; | 124 mutable FrameLoader m_deprecatedLoader; |
| 126 OwnPtr<MojoLoader> m_mojoLoader; | 125 OwnPtr<MojoLoader> m_mojoLoader; |
| 127 | 126 |
| 128 RefPtr<FrameView> m_view; | 127 RefPtr<FrameView> m_view; |
| 129 | 128 |
| 130 OwnPtr<DartController> m_dart; | |
| 131 const OwnPtr<Editor> m_editor; | 129 const OwnPtr<Editor> m_editor; |
| 132 const OwnPtr<SpellChecker> m_spellChecker; | 130 const OwnPtr<SpellChecker> m_spellChecker; |
| 133 const OwnPtr<FrameSelection> m_selection; | 131 const OwnPtr<FrameSelection> m_selection; |
| 134 const OwnPtr<EventHandler> m_eventHandler; | 132 const OwnPtr<EventHandler> m_eventHandler; |
| 135 const OwnPtr<NewEventHandler> m_newEventHandler; | 133 const OwnPtr<NewEventHandler> m_newEventHandler; |
| 136 const OwnPtr<FrameConsole> m_console; | 134 const OwnPtr<FrameConsole> m_console; |
| 137 OwnPtr<InputMethodController> m_inputMethodController; | 135 OwnPtr<InputMethodController> m_inputMethodController; |
| 138 | 136 |
| 139 Document* m_document; | 137 Document* m_document; |
| 140 }; | 138 }; |
| 141 | 139 |
| 142 inline FrameView* LocalFrame::view() const | 140 inline FrameView* LocalFrame::view() const |
| 143 { | 141 { |
| 144 return m_view.get(); | 142 return m_view.get(); |
| 145 } | 143 } |
| 146 | 144 |
| 147 inline DartController& LocalFrame::dart() | |
| 148 { | |
| 149 return *m_dart; | |
| 150 } | |
| 151 | |
| 152 inline FrameSelection& LocalFrame::selection() const | 145 inline FrameSelection& LocalFrame::selection() const |
| 153 { | 146 { |
| 154 return *m_selection; | 147 return *m_selection; |
| 155 } | 148 } |
| 156 | 149 |
| 157 inline Editor& LocalFrame::editor() const | 150 inline Editor& LocalFrame::editor() const |
| 158 { | 151 { |
| 159 return *m_editor; | 152 return *m_editor; |
| 160 } | 153 } |
| 161 | 154 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 189 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, true, true); | 182 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, true, true); |
| 190 | 183 |
| 191 } // namespace blink | 184 } // namespace blink |
| 192 | 185 |
| 193 // During refactoring, there are some places where we need to do type conversion
s that | 186 // During refactoring, there are some places where we need to do type conversion
s that |
| 194 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte
d out. | 187 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte
d out. |
| 195 // At that time this #define will be removed and all the uses of it will need to
be corrected. | 188 // At that time this #define will be removed and all the uses of it will need to
be corrected. |
| 196 #define toLocalFrameTemporary toLocalFrame | 189 #define toLocalFrameTemporary toLocalFrame |
| 197 | 190 |
| 198 #endif // SKY_ENGINE_CORE_FRAME_LOCALFRAME_H_ | 191 #endif // SKY_ENGINE_CORE_FRAME_LOCALFRAME_H_ |
| OLD | NEW |