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

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

Issue 104433003: Attach a WebLayer to a frame element for out-of-process iframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added missing null check Created 7 years 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 | « no previous file | Source/core/frame/Frame.cpp » ('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 19 matching lines...) Expand all
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
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 setRemotePlatformLayer(blink::WebLayer* remotePlatformLayer) { m_re motePlatformLayer = remotePlatformLayer; }
160 blink::WebLayer* remotePlatformLayer() const { return m_remotePlatformLa yer; }
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
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 blink::WebLayer* m_remotePlatformLayer;
239 }; 248 };
240 249
241 inline void Frame::init() 250 inline void Frame::init()
242 { 251 {
243 m_loader.init(); 252 m_loader.init();
244 } 253 }
245 254
246 inline FrameLoader& Frame::loader() const 255 inline FrameLoader& Frame::loader() const
247 { 256 {
248 return m_loader; 257 return m_loader;
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 329
321 inline EventHandler& Frame::eventHandler() const 330 inline EventHandler& Frame::eventHandler() const
322 { 331 {
323 ASSERT(m_eventHandler); 332 ASSERT(m_eventHandler);
324 return *m_eventHandler; 333 return *m_eventHandler;
325 } 334 }
326 335
327 } // namespace WebCore 336 } // namespace WebCore
328 337
329 #endif // Frame_h 338 #endif // Frame_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/frame/Frame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698