| 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 | 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights |
| 9 * reserved. | 9 * reserved. |
| 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 int m_navigationDisableCount; | 254 int m_navigationDisableCount; |
| 255 | 255 |
| 256 float m_pageZoomFactor; | 256 float m_pageZoomFactor; |
| 257 float m_textZoomFactor; | 257 float m_textZoomFactor; |
| 258 | 258 |
| 259 bool m_inViewSourceMode; | 259 bool m_inViewSourceMode; |
| 260 | 260 |
| 261 Member<InstrumentingAgents> m_instrumentingAgents; | 261 Member<InstrumentingAgents> m_instrumentingAgents; |
| 262 | 262 |
| 263 InterfaceProvider* const m_interfaceProvider; | 263 InterfaceProvider* const m_interfaceProvider; |
| 264 bool m_detached; |
| 264 }; | 265 }; |
| 265 | 266 |
| 266 inline void LocalFrame::init() { | 267 inline void LocalFrame::init() { |
| 267 m_loader.init(); | 268 m_loader.init(); |
| 268 } | 269 } |
| 269 | 270 |
| 270 inline LocalDOMWindow* LocalFrame::localDOMWindow() const { | 271 inline LocalDOMWindow* LocalFrame::localDOMWindow() const { |
| 271 return m_domWindow.get(); | 272 return m_domWindow.get(); |
| 272 } | 273 } |
| 273 | 274 |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 explicit ScopedFrameBlamer(LocalFrame*); | 364 explicit ScopedFrameBlamer(LocalFrame*); |
| 364 ~ScopedFrameBlamer(); | 365 ~ScopedFrameBlamer(); |
| 365 | 366 |
| 366 private: | 367 private: |
| 367 Member<LocalFrame> m_frame; | 368 Member<LocalFrame> m_frame; |
| 368 }; | 369 }; |
| 369 | 370 |
| 370 } // namespace blink | 371 } // namespace blink |
| 371 | 372 |
| 372 #endif // LocalFrame_h | 373 #endif // LocalFrame_h |
| OLD | NEW |