| 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 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 425 return; | 425 return; |
| 426 | 426 |
| 427 client()->willBeDetached(); | 427 client()->willBeDetached(); |
| 428 // Notify ScriptController that the frame is closing, since its cleanup ends | 428 // Notify ScriptController that the frame is closing, since its cleanup ends |
| 429 // up calling back to FrameLoaderClient via WindowProxy. | 429 // up calling back to FrameLoaderClient via WindowProxy. |
| 430 script().clearForClose(); | 430 script().clearForClose(); |
| 431 setView(nullptr); | 431 setView(nullptr); |
| 432 | 432 |
| 433 m_host->eventHandlerRegistry().didRemoveAllEventHandlers(*domWindow()); | 433 m_host->eventHandlerRegistry().didRemoveAllEventHandlers(*domWindow()); |
| 434 | 434 |
| 435 domWindow()->frameDestroyed(); | 435 domWindow()->contextDestroyed(); |
| 436 | 436 |
| 437 // TODO: Page should take care of updating focus/scrolling instead of Frame. | 437 // TODO: Page should take care of updating focus/scrolling instead of Frame. |
| 438 // TODO: It's unclear as to why this is called more than once, but it is, | 438 // TODO: It's unclear as to why this is called more than once, but it is, |
| 439 // so page() could be null. | 439 // so page() could be null. |
| 440 if (page() && page()->focusController().focusedFrame() == this) | 440 if (page() && page()->focusController().focusedFrame() == this) |
| 441 page()->focusController().setFocusedFrame(nullptr); | 441 page()->focusController().setFocusedFrame(nullptr); |
| 442 | 442 |
| 443 if (page() && page()->scrollingCoordinator() && m_view) | 443 if (page() && page()->scrollingCoordinator() && m_view) |
| 444 page()->scrollingCoordinator()->willDestroyScrollableArea(m_view.get()); | 444 page()->scrollingCoordinator()->willDestroyScrollableArea(m_view.get()); |
| 445 | 445 |
| (...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 942 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 942 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 943 m_frame->client()->frameBlameContext()->Enter(); | 943 m_frame->client()->frameBlameContext()->Enter(); |
| 944 } | 944 } |
| 945 | 945 |
| 946 ScopedFrameBlamer::~ScopedFrameBlamer() { | 946 ScopedFrameBlamer::~ScopedFrameBlamer() { |
| 947 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 947 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 948 m_frame->client()->frameBlameContext()->Leave(); | 948 m_frame->client()->frameBlameContext()->Leave(); |
| 949 } | 949 } |
| 950 | 950 |
| 951 } // namespace blink | 951 } // namespace blink |
| OLD | NEW |