| 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 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 397 | 397 |
| 398 void LocalFrame::willDetachFrameHost() | 398 void LocalFrame::willDetachFrameHost() |
| 399 { | 399 { |
| 400 LocalFrameLifecycleNotifier::notifyWillDetachFrameHost(); | 400 LocalFrameLifecycleNotifier::notifyWillDetachFrameHost(); |
| 401 | 401 |
| 402 // FIXME: Page should take care of updating focus/scrolling instead of Frame
. | 402 // FIXME: Page should take care of updating focus/scrolling instead of Frame
. |
| 403 // FIXME: It's unclear as to why this is called more than once, but it is, | 403 // FIXME: It's unclear as to why this is called more than once, but it is, |
| 404 // so page() could be null. | 404 // so page() could be null. |
| 405 if (page() && page()->focusController().focusedFrame() == this) | 405 if (page() && page()->focusController().focusedFrame() == this) |
| 406 page()->focusController().setFocusedFrame(nullptr); | 406 page()->focusController().setFocusedFrame(nullptr); |
| 407 script().clearScriptObjects(); | |
| 408 | 407 |
| 409 if (page() && page()->scrollingCoordinator() && m_view) | 408 if (page() && page()->scrollingCoordinator() && m_view) |
| 410 page()->scrollingCoordinator()->willDestroyScrollableArea(m_view.get()); | 409 page()->scrollingCoordinator()->willDestroyScrollableArea(m_view.get()); |
| 411 } | 410 } |
| 412 | 411 |
| 413 void LocalFrame::setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow> domWindow) | 412 void LocalFrame::setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow> domWindow) |
| 414 { | 413 { |
| 415 // Oilpan: setDOMWindow() cannot be used when finalizing. Which | 414 // Oilpan: setDOMWindow() cannot be used when finalizing. Which |
| 416 // is acceptable as its actions are either not needed or handled | 415 // is acceptable as its actions are either not needed or handled |
| 417 // by other means -- | 416 // by other means -- |
| (...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 869 { | 868 { |
| 870 m_frame->disableNavigation(); | 869 m_frame->disableNavigation(); |
| 871 } | 870 } |
| 872 | 871 |
| 873 FrameNavigationDisabler::~FrameNavigationDisabler() | 872 FrameNavigationDisabler::~FrameNavigationDisabler() |
| 874 { | 873 { |
| 875 m_frame->enableNavigation(); | 874 m_frame->enableNavigation(); |
| 876 } | 875 } |
| 877 | 876 |
| 878 } // namespace blink | 877 } // namespace blink |
| OLD | NEW |