Chromium Code Reviews| 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 19 matching lines...) Expand all Loading... | |
| 30 | 30 |
| 31 #include "core/loader/FrameLoader.h" | 31 #include "core/loader/FrameLoader.h" |
| 32 #include "core/loader/NavigationScheduler.h" | 32 #include "core/loader/NavigationScheduler.h" |
| 33 #include "core/frame/AdjustViewSizeOrNot.h" | 33 #include "core/frame/AdjustViewSizeOrNot.h" |
| 34 #include "core/page/FrameTree.h" | 34 #include "core/page/FrameTree.h" |
| 35 #include "platform/geometry/IntSize.h" | 35 #include "platform/geometry/IntSize.h" |
| 36 #include "platform/scroll/ScrollTypes.h" | 36 #include "platform/scroll/ScrollTypes.h" |
| 37 #include "wtf/Forward.h" | 37 #include "wtf/Forward.h" |
| 38 #include "wtf/RefCounted.h" | 38 #include "wtf/RefCounted.h" |
| 39 | 39 |
| 40 namespace blink { | |
| 41 class WebLayer; | |
| 42 } | |
| 43 | |
| 40 namespace WebCore { | 44 namespace WebCore { |
| 41 | 45 |
| 42 class AnimationController; | 46 class AnimationController; |
| 43 class ChromeClient; | 47 class ChromeClient; |
| 44 class Color; | 48 class Color; |
| 45 class DOMWindow; | 49 class DOMWindow; |
| 46 class Document; | 50 class Document; |
| 47 class DragImage; | 51 class DragImage; |
| 48 class Editor; | 52 class Editor; |
| 49 class Element; | 53 class Element; |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 145 ScriptController& script(); | 149 ScriptController& script(); |
| 146 SpellChecker& spellChecker() const; | 150 SpellChecker& spellChecker() const; |
| 147 | 151 |
| 148 RenderView* contentRenderer() const; // Root of the render tree for the document contained in this frame. | 152 RenderView* contentRenderer() const; // Root of the render tree for the document contained in this frame. |
| 149 RenderPart* ownerRenderer() const; // Renderer for the element that cont ains this frame. | 153 RenderPart* ownerRenderer() const; // Renderer for the element that cont ains this frame. |
| 150 | 154 |
| 151 void dispatchVisibilityStateChangeEvent(); | 155 void dispatchVisibilityStateChangeEvent(); |
| 152 | 156 |
| 153 int64_t frameID() const { return m_frameInit->frameID(); } | 157 int64_t frameID() const { return m_frameInit->frameID(); } |
| 154 | 158 |
| 159 void setPlatformLayer(blink::WebLayer* platformLayer) { m_platformLayer = platformLayer; } | |
|
eseidel
2013/12/11 18:50:01
I would give this a less generic name. setRemoteP
ncarter (slow)
2013/12/11 21:28:11
Is the oilpan comparison apt? I think our design i
| |
| 160 blink::WebLayer* platformLayer() const { return m_platformLayer; } | |
| 161 | |
| 155 // ======== All public functions below this point are candidates to move out of Frame into another class. ======== | 162 // ======== All public functions below this point are candidates to move out of Frame into another class. ======== |
| 156 | 163 |
| 157 bool inScope(TreeScope*) const; | 164 bool inScope(TreeScope*) const; |
| 158 | 165 |
| 159 // See GraphicsLayerClient.h for accepted flags. | 166 // See GraphicsLayerClient.h for accepted flags. |
| 160 String layerTreeAsText(unsigned flags = 0) const; | 167 String layerTreeAsText(unsigned flags = 0) const; |
| 161 String trackedRepaintRectsAsText() const; | 168 String trackedRepaintRectsAsText() const; |
| 162 | 169 |
| 163 Settings* settings() const; // can be NULL | 170 Settings* settings() const; // can be NULL |
| 164 | 171 |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 229 RefPtr<FrameInit> m_frameInit; | 236 RefPtr<FrameInit> m_frameInit; |
| 230 | 237 |
| 231 float m_pageZoomFactor; | 238 float m_pageZoomFactor; |
| 232 float m_textZoomFactor; | 239 float m_textZoomFactor; |
| 233 | 240 |
| 234 #if ENABLE(ORIENTATION_EVENTS) | 241 #if ENABLE(ORIENTATION_EVENTS) |
| 235 int m_orientation; | 242 int m_orientation; |
| 236 #endif | 243 #endif |
| 237 | 244 |
| 238 bool m_inViewSourceMode; | 245 bool m_inViewSourceMode; |
| 246 | |
| 247 // This layer is for frames whose contents are being rendered in a separ ate process. | |
|
eseidel
2013/12/11 18:50:01
You could just convey that in the member name.
kenrb
2013/12/11 22:44:56
Done.
| |
| 248 blink::WebLayer* m_platformLayer; | |
| 239 }; | 249 }; |
| 240 | 250 |
| 241 inline void Frame::init() | 251 inline void Frame::init() |
| 242 { | 252 { |
| 243 m_loader.init(); | 253 m_loader.init(); |
| 244 } | 254 } |
| 245 | 255 |
| 246 inline FrameLoader& Frame::loader() const | 256 inline FrameLoader& Frame::loader() const |
| 247 { | 257 { |
| 248 return m_loader; | 258 return m_loader; |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 320 | 330 |
| 321 inline EventHandler& Frame::eventHandler() const | 331 inline EventHandler& Frame::eventHandler() const |
| 322 { | 332 { |
| 323 ASSERT(m_eventHandler); | 333 ASSERT(m_eventHandler); |
| 324 return *m_eventHandler; | 334 return *m_eventHandler; |
| 325 } | 335 } |
| 326 | 336 |
| 327 } // namespace WebCore | 337 } // namespace WebCore |
| 328 | 338 |
| 329 #endif // Frame_h | 339 #endif // Frame_h |
| OLD | NEW |