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

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

Issue 296893009: Remove frameID hack for history. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
« 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 // FIXME: DOMWindow and Document should both be moved to LocalFrame 76 // FIXME: DOMWindow and Document should both be moved to LocalFrame
77 // after RemoteFrame is complete enough to exist without them. 77 // after RemoteFrame is complete enough to exist without them.
78 virtual void setDOMWindow(PassRefPtrWillBeRawPtr<DOMWindow>); 78 virtual void setDOMWindow(PassRefPtrWillBeRawPtr<DOMWindow>);
79 DOMWindow* domWindow() const; 79 DOMWindow* domWindow() const;
80 80
81 ChromeClient& chromeClient() const; 81 ChromeClient& chromeClient() const;
82 82
83 RenderPart* ownerRenderer() const; // Renderer for the element that contains this frame. 83 RenderPart* ownerRenderer() const; // Renderer for the element that contains this frame.
84 84
85 int64_t frameID() const { return m_frameID; }
86
87 // FIXME: These should move to RemoteFrame when that is instantiated. 85 // FIXME: These should move to RemoteFrame when that is instantiated.
88 void setRemotePlatformLayer(blink::WebLayer* remotePlatformLayer) { m_remote PlatformLayer = remotePlatformLayer; } 86 void setRemotePlatformLayer(blink::WebLayer* remotePlatformLayer) { m_remote PlatformLayer = remotePlatformLayer; }
89 blink::WebLayer* remotePlatformLayer() const { return m_remotePlatformLayer; } 87 blink::WebLayer* remotePlatformLayer() const { return m_remotePlatformLayer; }
90 88
91 Settings* settings() const; // can be null 89 Settings* settings() const; // can be null
92 90
93 // FIXME: This method identifies a LocalFrame that is acting as a RemoteFram e. 91 // FIXME: This method identifies a LocalFrame that is acting as a RemoteFram e.
94 // It is necessary only until we can instantiate a RemoteFrame, at which poi nt 92 // It is necessary only until we can instantiate a RemoteFrame, at which poi nt
95 // it can be removed and its callers can be converted to use the isRemoteFra me() 93 // it can be removed and its callers can be converted to use the isRemoteFra me()
96 // method. 94 // method.
97 bool isRemoteFrameTemporary() const { return m_remotePlatformLayer; } 95 bool isRemoteFrameTemporary() const { return m_remotePlatformLayer; }
98 96
99 protected: 97 protected:
100 Frame(FrameHost*, HTMLFrameOwnerElement*); 98 Frame(FrameHost*, HTMLFrameOwnerElement*);
101 99
102 FrameHost* m_host; 100 FrameHost* m_host;
103 HTMLFrameOwnerElement* m_ownerElement; 101 HTMLFrameOwnerElement* m_ownerElement;
104 102
105 RefPtrWillBePersistent<DOMWindow> m_domWindow; 103 RefPtrWillBePersistent<DOMWindow> m_domWindow;
106 104
107 private: 105 private:
108 106
109 HashSet<FrameDestructionObserver*> m_destructionObservers; 107 HashSet<FrameDestructionObserver*> m_destructionObservers;
110 108
111 // Temporary hack for history.
112 int64_t m_frameID;
113
114 blink::WebLayer* m_remotePlatformLayer; 109 blink::WebLayer* m_remotePlatformLayer;
115 }; 110 };
116 111
117 inline DOMWindow* Frame::domWindow() const 112 inline DOMWindow* Frame::domWindow() const
118 { 113 {
119 return m_domWindow.get(); 114 return m_domWindow.get();
120 } 115 }
121 116
122 inline HTMLFrameOwnerElement* Frame::ownerElement() const 117 inline HTMLFrameOwnerElement* Frame::ownerElement() const
123 { 118 {
124 return m_ownerElement; 119 return m_ownerElement;
125 } 120 }
126 121
127 } // namespace WebCore 122 } // namespace WebCore
128 123
129 #endif // Frame_h 124 #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