| 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 | 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All |
| 9 * rights reserved. | 9 * rights reserved. |
| 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> | 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> |
| (...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 424 return; | 424 return; |
| 425 | 425 |
| 426 client()->willBeDetached(); | 426 client()->willBeDetached(); |
| 427 // Notify ScriptController that the frame is closing, since its cleanup ends | 427 // Notify ScriptController that the frame is closing, since its cleanup ends |
| 428 // up calling back to FrameLoaderClient via WindowProxy. | 428 // up calling back to FrameLoaderClient via WindowProxy. |
| 429 script().clearForClose(); | 429 script().clearForClose(); |
| 430 setView(nullptr); | 430 setView(nullptr); |
| 431 | 431 |
| 432 m_host->eventHandlerRegistry().didRemoveAllEventHandlers(*localDOMWindow()); | 432 m_host->eventHandlerRegistry().didRemoveAllEventHandlers(*localDOMWindow()); |
| 433 | 433 |
| 434 localDOMWindow()->frameDestroyed(); | 434 localDOMWindow()->contextDestroyed(); |
| 435 | 435 |
| 436 // TODO: Page should take care of updating focus/scrolling instead of Frame. | 436 // TODO: Page should take care of updating focus/scrolling instead of Frame. |
| 437 // TODO: It's unclear as to why this is called more than once, but it is, | 437 // TODO: It's unclear as to why this is called more than once, but it is, |
| 438 // so page() could be null. | 438 // so page() could be null. |
| 439 if (page() && page()->focusController().focusedFrame() == this) | 439 if (page() && page()->focusController().focusedFrame() == this) |
| 440 page()->focusController().setFocusedFrame(nullptr); | 440 page()->focusController().setFocusedFrame(nullptr); |
| 441 | 441 |
| 442 if (page() && page()->scrollingCoordinator() && m_view) | 442 if (page() && page()->scrollingCoordinator() && m_view) |
| 443 page()->scrollingCoordinator()->willDestroyScrollableArea(m_view.get()); | 443 page()->scrollingCoordinator()->willDestroyScrollableArea(m_view.get()); |
| 444 | 444 |
| (...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 929 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 929 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 930 m_frame->client()->frameBlameContext()->Enter(); | 930 m_frame->client()->frameBlameContext()->Enter(); |
| 931 } | 931 } |
| 932 | 932 |
| 933 ScopedFrameBlamer::~ScopedFrameBlamer() { | 933 ScopedFrameBlamer::~ScopedFrameBlamer() { |
| 934 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 934 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 935 m_frame->client()->frameBlameContext()->Leave(); | 935 m_frame->client()->frameBlameContext()->Leave(); |
| 936 } | 936 } |
| 937 | 937 |
| 938 } // namespace blink | 938 } // namespace blink |
| OLD | NEW |