| 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 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 433 m_loader.clear(); | 433 m_loader.clear(); |
| 434 if (!client()) | 434 if (!client()) |
| 435 return; | 435 return; |
| 436 | 436 |
| 437 client()->willBeDetached(); | 437 client()->willBeDetached(); |
| 438 // Notify ScriptController that the frame is closing, since its cleanup ends | 438 // Notify ScriptController that the frame is closing, since its cleanup ends |
| 439 // up calling back to LocalFrameClient via WindowProxy. | 439 // up calling back to LocalFrameClient via WindowProxy. |
| 440 script().clearForClose(); | 440 script().clearForClose(); |
| 441 setView(nullptr); | 441 setView(nullptr); |
| 442 | 442 |
| 443 m_host->eventHandlerRegistry().didRemoveAllEventHandlers(*domWindow()); | 443 m_host->page().eventHandlerRegistry().didRemoveAllEventHandlers(*domWindow()); |
| 444 | 444 |
| 445 domWindow()->frameDestroyed(); | 445 domWindow()->frameDestroyed(); |
| 446 | 446 |
| 447 // TODO: Page should take care of updating focus/scrolling instead of Frame. | 447 // TODO: Page should take care of updating focus/scrolling instead of Frame. |
| 448 // TODO: It's unclear as to why this is called more than once, but it is, | 448 // TODO: It's unclear as to why this is called more than once, but it is, |
| 449 // so page() could be null. | 449 // so page() could be null. |
| 450 if (page() && page()->focusController().focusedFrame() == this) | 450 if (page() && page()->focusController().focusedFrame() == this) |
| 451 page()->focusController().setFocusedFrame(nullptr); | 451 page()->focusController().setFocusedFrame(nullptr); |
| 452 | 452 |
| 453 if (page() && page()->scrollingCoordinator() && m_view) | 453 if (page() && page()->scrollingCoordinator() && m_view) |
| (...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 916 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 916 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 917 m_frame->client()->frameBlameContext()->Enter(); | 917 m_frame->client()->frameBlameContext()->Enter(); |
| 918 } | 918 } |
| 919 | 919 |
| 920 ScopedFrameBlamer::~ScopedFrameBlamer() { | 920 ScopedFrameBlamer::~ScopedFrameBlamer() { |
| 921 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 921 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 922 m_frame->client()->frameBlameContext()->Leave(); | 922 m_frame->client()->frameBlameContext()->Leave(); |
| 923 } | 923 } |
| 924 | 924 |
| 925 } // namespace blink | 925 } // namespace blink |
| OLD | NEW |