| 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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 // FIXME: once scroll customization is enabled everywhere | 172 // FIXME: once scroll customization is enabled everywhere |
| 173 // (crbug.com/416862), this should take a ScrollState object. | 173 // (crbug.com/416862), this should take a ScrollState object. |
| 174 ScrollResult applyScrollDelta(const FloatSize& delta, bool isScrollBegin); | 174 ScrollResult applyScrollDelta(const FloatSize& delta, bool isScrollBegin); |
| 175 bool shouldScrollTopControls(const FloatSize& delta) const; | 175 bool shouldScrollTopControls(const FloatSize& delta) const; |
| 176 | 176 |
| 177 #if ENABLE(OILPAN) | 177 #if ENABLE(OILPAN) |
| 178 void registerPluginElement(HTMLPlugInElement*); | 178 void registerPluginElement(HTMLPlugInElement*); |
| 179 void unregisterPluginElement(HTMLPlugInElement*); | 179 void unregisterPluginElement(HTMLPlugInElement*); |
| 180 void clearWeakMembers(Visitor*); | 180 void clearWeakMembers(Visitor*); |
| 181 #endif | 181 #endif |
| 182 DisplayItemClient displayItemClient() const { return toDisplayItemClient(thi
s); } | 182 DisplayItemClient displayItemClient() const { return DisplayItemClient(this)
; } |
| 183 String debugName() const { return "LocalFrame"; } | 183 String debugName() const { return "LocalFrame"; } |
| 184 | 184 |
| 185 bool shouldThrottleRendering() const; | 185 bool shouldThrottleRendering() const; |
| 186 | 186 |
| 187 // ======== | 187 // ======== |
| 188 | 188 |
| 189 // Returns the frame scheduler, creating one if needed. | 189 // Returns the frame scheduler, creating one if needed. |
| 190 WebFrameScheduler* frameScheduler(); | 190 WebFrameScheduler* frameScheduler(); |
| 191 void updateFrameSecurityOrigin(); | 191 void updateFrameSecurityOrigin(); |
| 192 | 192 |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 327 DECLARE_WEAK_IDENTIFIER_MAP(LocalFrame); | 327 DECLARE_WEAK_IDENTIFIER_MAP(LocalFrame); |
| 328 | 328 |
| 329 } // namespace blink | 329 } // namespace blink |
| 330 | 330 |
| 331 // During refactoring, there are some places where we need to do type conversion
s that | 331 // During refactoring, there are some places where we need to do type conversion
s that |
| 332 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte
d out. | 332 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte
d out. |
| 333 // At that time this #define will be removed and all the uses of it will need to
be corrected. | 333 // At that time this #define will be removed and all the uses of it will need to
be corrected. |
| 334 #define toLocalFrameTemporary toLocalFrame | 334 #define toLocalFrameTemporary toLocalFrame |
| 335 | 335 |
| 336 #endif // LocalFrame_h | 336 #endif // LocalFrame_h |
| OLD | NEW |