| 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 // FIXME: LocalDOMWindow and Document should both be moved to LocalFrame | 84 // FIXME: LocalDOMWindow and Document should both be moved to LocalFrame |
| 85 // after RemoteFrame is complete enough to exist without them. | 85 // after RemoteFrame is complete enough to exist without them. |
| 86 virtual void setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow>); | 86 virtual void setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow>); |
| 87 LocalDOMWindow* domWindow() const; | 87 LocalDOMWindow* domWindow() const; |
| 88 | 88 |
| 89 FrameTree& tree() const; | 89 FrameTree& tree() const; |
| 90 ChromeClient& chromeClient() const; | 90 ChromeClient& chromeClient() const; |
| 91 | 91 |
| 92 RenderPart* ownerRenderer() const; // Renderer for the element that contains
this frame. | 92 RenderPart* ownerRenderer() const; // Renderer for the element that contains
this frame. |
| 93 | 93 |
| 94 int64_t frameID() const { return m_frameID; } |
| 95 |
| 94 // FIXME: These should move to RemoteFrame when that is instantiated. | 96 // FIXME: These should move to RemoteFrame when that is instantiated. |
| 95 void setRemotePlatformLayer(blink::WebLayer*); | 97 void setRemotePlatformLayer(blink::WebLayer*); |
| 96 blink::WebLayer* remotePlatformLayer() const { return m_remotePlatformLayer;
} | 98 blink::WebLayer* remotePlatformLayer() const { return m_remotePlatformLayer;
} |
| 97 | 99 |
| 98 Settings* settings() const; // can be null | 100 Settings* settings() const; // can be null |
| 99 | 101 |
| 100 // FIXME: This method identifies a LocalFrame that is acting as a RemoteFram
e. | 102 // FIXME: This method identifies a LocalFrame that is acting as a RemoteFram
e. |
| 101 // It is necessary only until we can instantiate a RemoteFrame, at which poi
nt | 103 // It is necessary only until we can instantiate a RemoteFrame, at which poi
nt |
| 102 // it can be removed and its callers can be converted to use the isRemoteFra
me() | 104 // it can be removed and its callers can be converted to use the isRemoteFra
me() |
| 103 // method. | 105 // method. |
| 104 bool isRemoteFrameTemporary() const { return m_remotePlatformLayer; } | 106 bool isRemoteFrameTemporary() const { return m_remotePlatformLayer; } |
| 105 | 107 |
| 106 protected: | 108 protected: |
| 107 Frame(FrameClient*, FrameHost*, FrameOwner*); | 109 Frame(FrameClient*, FrameHost*, FrameOwner*); |
| 108 | 110 |
| 109 mutable FrameTree m_treeNode; | 111 mutable FrameTree m_treeNode; |
| 110 | 112 |
| 111 FrameHost* m_host; | 113 FrameHost* m_host; |
| 112 FrameOwner* m_owner; | 114 FrameOwner* m_owner; |
| 113 | 115 |
| 114 RefPtrWillBePersistent<LocalDOMWindow> m_domWindow; | 116 RefPtrWillBePersistent<LocalDOMWindow> m_domWindow; |
| 115 | 117 |
| 116 private: | 118 private: |
| 117 FrameClient* m_client; | 119 FrameClient* m_client; |
| 118 HashSet<FrameDestructionObserver*> m_destructionObservers; | 120 HashSet<FrameDestructionObserver*> m_destructionObservers; |
| 119 | 121 |
| 122 // Temporary hack for history. |
| 123 int64_t m_frameID; |
| 124 |
| 120 blink::WebLayer* m_remotePlatformLayer; | 125 blink::WebLayer* m_remotePlatformLayer; |
| 121 }; | 126 }; |
| 122 | 127 |
| 123 inline FrameClient* Frame::client() const | 128 inline FrameClient* Frame::client() const |
| 124 { | 129 { |
| 125 return m_client; | 130 return m_client; |
| 126 } | 131 } |
| 127 | 132 |
| 128 inline void Frame::clearClient() | 133 inline void Frame::clearClient() |
| 129 { | 134 { |
| (...skipping 14 matching lines...) Expand all Loading... |
| 144 { | 149 { |
| 145 return m_treeNode; | 150 return m_treeNode; |
| 146 } | 151 } |
| 147 | 152 |
| 148 // Allow equality comparisons of Frames by reference or pointer, interchangeably
. | 153 // Allow equality comparisons of Frames by reference or pointer, interchangeably
. |
| 149 DEFINE_COMPARISON_OPERATORS_WITH_REFERENCES_REFCOUNTED(Frame) | 154 DEFINE_COMPARISON_OPERATORS_WITH_REFERENCES_REFCOUNTED(Frame) |
| 150 | 155 |
| 151 } // namespace WebCore | 156 } // namespace WebCore |
| 152 | 157 |
| 153 #endif // Frame_h | 158 #endif // Frame_h |
| OLD | NEW |