Chromium Code Reviews| 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 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Simon Hausmann <hausmann@kde.org> | 5 * 2000 Simon Hausmann <hausmann@kde.org> |
| 6 * 2000 Stefan Schimanski <1Stein@gmx.de> | 6 * 2000 Stefan Schimanski <1Stein@gmx.de> |
| 7 * 2001 George Staikos <staikos@kde.org> | 7 * 2001 George Staikos <staikos@kde.org> |
| 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. | 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. |
| 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> | 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> |
| 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| (...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 343 // First give the plugin elements holding persisted, | 343 // First give the plugin elements holding persisted, |
| 344 // renderer-less plugins the opportunity to dispose of them. | 344 // renderer-less plugins the opportunity to dispose of them. |
| 345 for (const auto& pluginElement : m_pluginElements) | 345 for (const auto& pluginElement : m_pluginElements) |
| 346 pluginElement->disconnectContentFrame(); | 346 pluginElement->disconnectContentFrame(); |
| 347 m_pluginElements.clear(); | 347 m_pluginElements.clear(); |
| 348 #endif | 348 #endif |
| 349 } | 349 } |
| 350 Frame::disconnectOwnerElement(); | 350 Frame::disconnectOwnerElement(); |
| 351 } | 351 } |
| 352 | 352 |
| 353 bool LocalFrame::shouldClose() | |
| 354 { | |
| 355 return m_loader.shouldClose(); | |
|
dcheng
2015/06/17 23:39:50
Let's add a TODO, since we need to fix this to wor
nasko
2015/06/19 13:23:22
Done.
| |
| 356 } | |
| 357 | |
| 353 void LocalFrame::willDetachFrameHost() | 358 void LocalFrame::willDetachFrameHost() |
| 354 { | 359 { |
| 355 LocalFrameLifecycleNotifier::notifyWillDetachFrameHost(); | 360 LocalFrameLifecycleNotifier::notifyWillDetachFrameHost(); |
| 356 | 361 |
| 357 // FIXME: Page should take care of updating focus/scrolling instead of Frame . | 362 // FIXME: Page should take care of updating focus/scrolling instead of Frame . |
| 358 // FIXME: It's unclear as to why this is called more than once, but it is, | 363 // FIXME: It's unclear as to why this is called more than once, but it is, |
| 359 // so page() could be null. | 364 // so page() could be null. |
| 360 if (page() && page()->focusController().focusedFrame() == this) | 365 if (page() && page()->focusController().focusedFrame() == this) |
| 361 page()->focusController().setFocusedFrame(nullptr); | 366 page()->focusController().setFocusedFrame(nullptr); |
| 362 script().clearScriptObjects(); | 367 script().clearScriptObjects(); |
| (...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 833 , m_textZoomFactor(parentTextZoomFactor(this)) | 838 , m_textZoomFactor(parentTextZoomFactor(this)) |
| 834 , m_inViewSourceMode(false) | 839 , m_inViewSourceMode(false) |
| 835 { | 840 { |
| 836 if (isLocalRoot()) | 841 if (isLocalRoot()) |
| 837 m_instrumentingAgents = InstrumentingAgents::create(); | 842 m_instrumentingAgents = InstrumentingAgents::create(); |
| 838 else | 843 else |
| 839 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; | 844 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; |
| 840 } | 845 } |
| 841 | 846 |
| 842 } // namespace blink | 847 } // namespace blink |
| OLD | NEW |