| 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 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 211 void scheduleVisualUpdateUnlessThrottled(); | 211 void scheduleVisualUpdateUnlessThrottled(); |
| 212 | 212 |
| 213 bool isNavigationAllowed() const { return m_navigationDisableCount == 0; } | 213 bool isNavigationAllowed() const { return m_navigationDisableCount == 0; } |
| 214 | 214 |
| 215 InterfaceProvider* interfaceProvider() { return m_interfaceProvider; } | 215 InterfaceProvider* interfaceProvider() { return m_interfaceProvider; } |
| 216 | 216 |
| 217 FrameLoaderClient* client() const; | 217 FrameLoaderClient* client() const; |
| 218 | 218 |
| 219 PluginData* pluginData() const; | 219 PluginData* pluginData() const; |
| 220 | 220 |
| 221 bool isFrameDetachedForSpecialOneOffStopTheCrashingHackBug561873() const { |
| 222 return m_detached || !client(); |
| 223 } |
| 224 |
| 221 private: | 225 private: |
| 222 friend class FrameNavigationDisabler; | 226 friend class FrameNavigationDisabler; |
| 223 | 227 |
| 224 LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*, InterfaceProvider*); | 228 LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*, InterfaceProvider*); |
| 225 | 229 |
| 226 // Internal Frame helper overrides: | 230 // Internal Frame helper overrides: |
| 227 WindowProxyManager* getWindowProxyManager() const override; | 231 WindowProxyManager* getWindowProxyManager() const override; |
| 228 // Intentionally private to prevent redundant checks when the type is | 232 // Intentionally private to prevent redundant checks when the type is |
| 229 // already LocalFrame. | 233 // already LocalFrame. |
| 230 bool isLocalFrame() const override { return true; } | 234 bool isLocalFrame() const override { return true; } |
| (...skipping 19 matching lines...) Expand all Loading... |
| 250 const Member<EventHandler> m_eventHandler; | 254 const Member<EventHandler> m_eventHandler; |
| 251 const Member<FrameConsole> m_console; | 255 const Member<FrameConsole> m_console; |
| 252 const Member<InputMethodController> m_inputMethodController; | 256 const Member<InputMethodController> m_inputMethodController; |
| 253 | 257 |
| 254 int m_navigationDisableCount; | 258 int m_navigationDisableCount; |
| 255 | 259 |
| 256 float m_pageZoomFactor; | 260 float m_pageZoomFactor; |
| 257 float m_textZoomFactor; | 261 float m_textZoomFactor; |
| 258 | 262 |
| 259 bool m_inViewSourceMode; | 263 bool m_inViewSourceMode; |
| 264 bool m_detached = false; |
| 260 | 265 |
| 261 Member<InstrumentingAgents> m_instrumentingAgents; | 266 Member<InstrumentingAgents> m_instrumentingAgents; |
| 262 | 267 |
| 263 InterfaceProvider* const m_interfaceProvider; | 268 InterfaceProvider* const m_interfaceProvider; |
| 264 }; | 269 }; |
| 265 | 270 |
| 266 inline void LocalFrame::init() { | 271 inline void LocalFrame::init() { |
| 267 m_loader.init(); | 272 m_loader.init(); |
| 268 } | 273 } |
| 269 | 274 |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 explicit ScopedFrameBlamer(LocalFrame*); | 368 explicit ScopedFrameBlamer(LocalFrame*); |
| 364 ~ScopedFrameBlamer(); | 369 ~ScopedFrameBlamer(); |
| 365 | 370 |
| 366 private: | 371 private: |
| 367 Member<LocalFrame> m_frame; | 372 Member<LocalFrame> m_frame; |
| 368 }; | 373 }; |
| 369 | 374 |
| 370 } // namespace blink | 375 } // namespace blink |
| 371 | 376 |
| 372 #endif // LocalFrame_h | 377 #endif // LocalFrame_h |
| OLD | NEW |