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

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

Issue 235553006: Move Document pointer from Frame to LocalFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 8 months 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
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 21 matching lines...) Expand all
32 #include "wtf/Forward.h" 32 #include "wtf/Forward.h"
33 #include "wtf/HashSet.h" 33 #include "wtf/HashSet.h"
34 #include "wtf/RefCounted.h" 34 #include "wtf/RefCounted.h"
35 35
36 namespace blink { 36 namespace blink {
37 class WebLayer; 37 class WebLayer;
38 } 38 }
39 39
40 namespace WebCore { 40 namespace WebCore {
41 41
42 class Document;
43 class DOMWindow; 42 class DOMWindow;
44 class ChromeClient; 43 class ChromeClient;
45 class FrameDestructionObserver; 44 class FrameDestructionObserver;
46 class FrameHost; 45 class FrameHost;
47 class HTMLFrameOwnerElement; 46 class HTMLFrameOwnerElement;
48 class Page; 47 class Page;
49 class RenderPart; 48 class RenderPart;
50 class RenderView;
51 class Settings; 49 class Settings;
52 50
53 class Frame : public RefCounted<Frame> { 51 class Frame : public RefCounted<Frame> {
54 public: 52 public:
55 virtual bool isLocalFrame() const { return false; } 53 virtual bool isLocalFrame() const { return false; }
56 virtual bool isRemoteFrame() const { return false; } 54 virtual bool isRemoteFrame() const { return false; }
57 55
58 virtual ~Frame(); 56 virtual ~Frame();
59 57
60 void addDestructionObserver(FrameDestructionObserver*); 58 void addDestructionObserver(FrameDestructionObserver*);
61 void removeDestructionObserver(FrameDestructionObserver*); 59 void removeDestructionObserver(FrameDestructionObserver*);
62 60
63 virtual void willDetachFrameHost(); 61 virtual void willDetachFrameHost();
64 virtual void detachFromFrameHost(); 62 virtual void detachFromFrameHost();
65 63
66 // NOTE: Page is moving out of Blink up into the browser process as 64 // NOTE: Page is moving out of Blink up into the browser process as
67 // part of the site-isolation (out of process iframes) work. 65 // part of the site-isolation (out of process iframes) work.
68 // FrameHost should be used instead where possible. 66 // FrameHost should be used instead where possible.
69 Page* page() const; 67 Page* page() const;
70 FrameHost* host() const; // Null when the frame is detached. 68 FrameHost* host() const; // Null when the frame is detached.
71 69
72 bool isMainFrame() const; 70 bool isMainFrame() const;
73 71
74 void disconnectOwnerElement(); 72 virtual void disconnectOwnerElement();
75 73
76 HTMLFrameOwnerElement* ownerElement() const; 74 HTMLFrameOwnerElement* ownerElement() const;
77 75
78 // FIXME: DOMWindow and Document should both be moved to LocalFrame 76 // FIXME: DOMWindow and Document should both be moved to LocalFrame
79 // after RemoteFrame is complete enough to exist without them. 77 // after RemoteFrame is complete enough to exist without them.
80 virtual void setDOMWindow(PassRefPtrWillBeRawPtr<DOMWindow>); 78 virtual void setDOMWindow(PassRefPtrWillBeRawPtr<DOMWindow>);
81 DOMWindow* domWindow() const; 79 DOMWindow* domWindow() const;
82 Document* document() const;
83 80
84 ChromeClient& chromeClient() const; 81 ChromeClient& chromeClient() const;
85 82
86 RenderView* contentRenderer() const; // Root of the render tree for the docu ment contained in this frame.
87 RenderPart* ownerRenderer() const; // Renderer for the element that contains this frame. 83 RenderPart* ownerRenderer() const; // Renderer for the element that contains this frame.
88 84
89 int64_t frameID() const { return m_frameID; } 85 int64_t frameID() const { return m_frameID; }
90 86
91 // FIXME: These should move to RemoteFrame when that is instantiated. 87 // FIXME: These should move to RemoteFrame when that is instantiated.
92 void setRemotePlatformLayer(blink::WebLayer* remotePlatformLayer) { m_remote PlatformLayer = remotePlatformLayer; } 88 void setRemotePlatformLayer(blink::WebLayer* remotePlatformLayer) { m_remote PlatformLayer = remotePlatformLayer; }
93 blink::WebLayer* remotePlatformLayer() const { return m_remotePlatformLayer; } 89 blink::WebLayer* remotePlatformLayer() const { return m_remotePlatformLayer; }
94 90
95 Settings* settings() const; // can be null 91 Settings* settings() const; // can be null
96 92
(...skipping 27 matching lines...) Expand all
124 } 120 }
125 121
126 inline HTMLFrameOwnerElement* Frame::ownerElement() const 122 inline HTMLFrameOwnerElement* Frame::ownerElement() const
127 { 123 {
128 return m_ownerElement; 124 return m_ownerElement;
129 } 125 }
130 126
131 } // namespace WebCore 127 } // namespace WebCore
132 128
133 #endif // Frame_h 129 #endif // Frame_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698