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