| 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 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 382 | 382 |
| 383 void LocalFrame::willDetachFrameHost() | 383 void LocalFrame::willDetachFrameHost() |
| 384 { | 384 { |
| 385 LocalFrameLifecycleNotifier::notifyWillDetachFrameHost(); | 385 LocalFrameLifecycleNotifier::notifyWillDetachFrameHost(); |
| 386 | 386 |
| 387 // FIXME: Page should take care of updating focus/scrolling instead of Frame
. | 387 // FIXME: Page should take care of updating focus/scrolling instead of Frame
. |
| 388 // FIXME: It's unclear as to why this is called more than once, but it is, | 388 // FIXME: It's unclear as to why this is called more than once, but it is, |
| 389 // so page() could be null. | 389 // so page() could be null. |
| 390 if (page() && page()->focusController().focusedFrame() == this) | 390 if (page() && page()->focusController().focusedFrame() == this) |
| 391 page()->focusController().setFocusedFrame(nullptr); | 391 page()->focusController().setFocusedFrame(nullptr); |
| 392 script().clearScriptObjects(); | |
| 393 | 392 |
| 394 if (page() && page()->scrollingCoordinator() && m_view) | 393 if (page() && page()->scrollingCoordinator() && m_view) |
| 395 page()->scrollingCoordinator()->willDestroyScrollableArea(m_view.get()); | 394 page()->scrollingCoordinator()->willDestroyScrollableArea(m_view.get()); |
| 396 } | 395 } |
| 397 | 396 |
| 398 void LocalFrame::setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow> domWindow) | 397 void LocalFrame::setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow> domWindow) |
| 399 { | 398 { |
| 400 // Oilpan: setDOMWindow() cannot be used when finalizing. Which | 399 // Oilpan: setDOMWindow() cannot be used when finalizing. Which |
| 401 // is acceptable as its actions are either not needed or handled | 400 // is acceptable as its actions are either not needed or handled |
| 402 // by other means -- | 401 // by other means -- |
| (...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 889 { | 888 { |
| 890 m_frame->disableNavigation(); | 889 m_frame->disableNavigation(); |
| 891 } | 890 } |
| 892 | 891 |
| 893 FrameNavigationDisabler::~FrameNavigationDisabler() | 892 FrameNavigationDisabler::~FrameNavigationDisabler() |
| 894 { | 893 { |
| 895 m_frame->enableNavigation(); | 894 m_frame->enableNavigation(); |
| 896 } | 895 } |
| 897 | 896 |
| 898 } // namespace blink | 897 } // namespace blink |
| OLD | NEW |