| 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 class FloatRect; | 46 class FloatRect; |
| 47 class FloatSize; | 47 class FloatSize; |
| 48 class FrameConsole; | 48 class FrameConsole; |
| 49 class FrameDestructionObserver; | 49 class FrameDestructionObserver; |
| 50 class FrameSelection; | 50 class FrameSelection; |
| 51 class FrameView; | 51 class FrameView; |
| 52 class InputMethodController; | 52 class InputMethodController; |
| 53 class IntPoint; | 53 class IntPoint; |
| 54 class IntSize; | 54 class IntSize; |
| 55 class MojoLoader; | 55 class MojoLoader; |
| 56 class NewEventHandler; |
| 56 class Node; | 57 class Node; |
| 57 class Range; | 58 class Range; |
| 58 class RenderView; | 59 class RenderView; |
| 59 class ScriptController; | 60 class ScriptController; |
| 60 class SpellChecker; | 61 class SpellChecker; |
| 61 class TreeScope; | 62 class TreeScope; |
| 62 class TreeScope; | 63 class TreeScope; |
| 63 class VisiblePosition; | 64 class VisiblePosition; |
| 64 | 65 |
| 65 class LocalFrame : public Frame, public Supplementable<LocalFrame> { | 66 class LocalFrame : public Frame, public Supplementable<LocalFrame> { |
| (...skipping 16 matching lines...) Expand all Loading... |
| 82 void detachFromFrameHost(); | 83 void detachFromFrameHost(); |
| 83 | 84 |
| 84 virtual void setDOMWindow(PassRefPtr<LocalDOMWindow>) override; | 85 virtual void setDOMWindow(PassRefPtr<LocalDOMWindow>) override; |
| 85 FrameView* view() const; | 86 FrameView* view() const; |
| 86 Document* document() const; | 87 Document* document() const; |
| 87 | 88 |
| 88 RenderView* contentRenderer() const; // Root of the render tree for the
document contained in this frame. | 89 RenderView* contentRenderer() const; // Root of the render tree for the
document contained in this frame. |
| 89 | 90 |
| 90 Editor& editor() const; | 91 Editor& editor() const; |
| 91 EventHandler& eventHandler() const; | 92 EventHandler& eventHandler() const; |
| 93 NewEventHandler& newEventHandler() const; |
| 92 MojoLoader& mojoLoader() const { return *m_mojoLoader; } | 94 MojoLoader& mojoLoader() const { return *m_mojoLoader; } |
| 93 FrameSelection& selection() const; | 95 FrameSelection& selection() const; |
| 94 InputMethodController& inputMethodController() const; | 96 InputMethodController& inputMethodController() const; |
| 95 FetchContext& fetchContext() const; | 97 FetchContext& fetchContext() const; |
| 96 ScriptController& script(); | 98 ScriptController& script(); |
| 97 SpellChecker& spellChecker() const; | 99 SpellChecker& spellChecker() const; |
| 98 FrameConsole& console() const; | 100 FrameConsole& console() const; |
| 99 | 101 |
| 100 void didChangeVisibilityState(); | 102 void didChangeVisibilityState(); |
| 101 | 103 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 125 mutable FrameLoader m_deprecatedLoader; | 127 mutable FrameLoader m_deprecatedLoader; |
| 126 OwnPtr<MojoLoader> m_mojoLoader; | 128 OwnPtr<MojoLoader> m_mojoLoader; |
| 127 | 129 |
| 128 RefPtr<FrameView> m_view; | 130 RefPtr<FrameView> m_view; |
| 129 | 131 |
| 130 OwnPtr<ScriptController> m_script; | 132 OwnPtr<ScriptController> m_script; |
| 131 const OwnPtr<Editor> m_editor; | 133 const OwnPtr<Editor> m_editor; |
| 132 const OwnPtr<SpellChecker> m_spellChecker; | 134 const OwnPtr<SpellChecker> m_spellChecker; |
| 133 const OwnPtr<FrameSelection> m_selection; | 135 const OwnPtr<FrameSelection> m_selection; |
| 134 const OwnPtr<EventHandler> m_eventHandler; | 136 const OwnPtr<EventHandler> m_eventHandler; |
| 137 const OwnPtr<NewEventHandler> m_newEventHandler; |
| 135 const OwnPtr<FrameConsole> m_console; | 138 const OwnPtr<FrameConsole> m_console; |
| 136 OwnPtr<InputMethodController> m_inputMethodController; | 139 OwnPtr<InputMethodController> m_inputMethodController; |
| 137 }; | 140 }; |
| 138 | 141 |
| 139 inline FrameView* LocalFrame::view() const | 142 inline FrameView* LocalFrame::view() const |
| 140 { | 143 { |
| 141 return m_view.get(); | 144 return m_view.get(); |
| 142 } | 145 } |
| 143 | 146 |
| 144 inline ScriptController& LocalFrame::script() | 147 inline ScriptController& LocalFrame::script() |
| (...skipping 25 matching lines...) Expand all Loading... |
| 170 { | 173 { |
| 171 return *m_inputMethodController; | 174 return *m_inputMethodController; |
| 172 } | 175 } |
| 173 | 176 |
| 174 inline EventHandler& LocalFrame::eventHandler() const | 177 inline EventHandler& LocalFrame::eventHandler() const |
| 175 { | 178 { |
| 176 ASSERT(m_eventHandler); | 179 ASSERT(m_eventHandler); |
| 177 return *m_eventHandler; | 180 return *m_eventHandler; |
| 178 } | 181 } |
| 179 | 182 |
| 183 inline NewEventHandler& LocalFrame::newEventHandler() const |
| 184 { |
| 185 ASSERT(m_newEventHandler); |
| 186 return *m_newEventHandler; |
| 187 } |
| 188 |
| 180 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, true, true); | 189 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, true, true); |
| 181 | 190 |
| 182 } // namespace blink | 191 } // namespace blink |
| 183 | 192 |
| 184 // During refactoring, there are some places where we need to do type conversion
s that | 193 // During refactoring, there are some places where we need to do type conversion
s that |
| 185 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte
d out. | 194 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte
d out. |
| 186 // At that time this #define will be removed and all the uses of it will need to
be corrected. | 195 // At that time this #define will be removed and all the uses of it will need to
be corrected. |
| 187 #define toLocalFrameTemporary toLocalFrame | 196 #define toLocalFrameTemporary toLocalFrame |
| 188 | 197 |
| 189 #endif // SKY_ENGINE_CORE_FRAME_LOCALFRAME_H_ | 198 #endif // SKY_ENGINE_CORE_FRAME_LOCALFRAME_H_ |
| OLD | NEW |