Chromium Code Reviews| 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 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 418 ScriptForbiddenScope forbidScript; | 418 ScriptForbiddenScope forbidScript; |
| 419 m_loader.clear(); | 419 m_loader.clear(); |
| 420 if (!client()) | 420 if (!client()) |
| 421 return; | 421 return; |
| 422 | 422 |
| 423 client()->willBeDetached(); | 423 client()->willBeDetached(); |
| 424 // Notify ScriptController that the frame is closing, since its cleanup ends | 424 // Notify ScriptController that the frame is closing, since its cleanup ends |
| 425 // up calling back to FrameLoaderClient via WindowProxy. | 425 // up calling back to FrameLoaderClient via WindowProxy. |
| 426 script().clearForClose(); | 426 script().clearForClose(); |
| 427 setView(nullptr); | 427 setView(nullptr); |
| 428 m_performanceMonitor->shutdown(); | |
|
caseq
2016/12/01 02:04:03
This does not look good already.
| |
| 428 | 429 |
| 429 m_host->eventHandlerRegistry().didRemoveAllEventHandlers(*localDOMWindow()); | 430 m_host->eventHandlerRegistry().didRemoveAllEventHandlers(*localDOMWindow()); |
| 430 | 431 |
| 431 localDOMWindow()->frameDestroyed(); | 432 localDOMWindow()->frameDestroyed(); |
| 432 | 433 |
| 433 // TODO: Page should take care of updating focus/scrolling instead of Frame. | 434 // TODO: Page should take care of updating focus/scrolling instead of Frame. |
| 434 // TODO: It's unclear as to why this is called more than once, but it is, | 435 // TODO: It's unclear as to why this is called more than once, but it is, |
| 435 // so page() could be null. | 436 // so page() could be null. |
| 436 if (page() && page()->focusController().focusedFrame() == this) | 437 if (page() && page()->focusController().focusedFrame() == this) |
| 437 page()->focusController().setFocusedFrame(nullptr); | 438 page()->focusController().setFocusedFrame(nullptr); |
| (...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 926 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 927 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 927 m_frame->client()->frameBlameContext()->Enter(); | 928 m_frame->client()->frameBlameContext()->Enter(); |
| 928 } | 929 } |
| 929 | 930 |
| 930 ScopedFrameBlamer::~ScopedFrameBlamer() { | 931 ScopedFrameBlamer::~ScopedFrameBlamer() { |
| 931 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 932 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 932 m_frame->client()->frameBlameContext()->Leave(); | 933 m_frame->client()->frameBlameContext()->Leave(); |
| 933 } | 934 } |
| 934 | 935 |
| 935 } // namespace blink | 936 } // namespace blink |
| OLD | NEW |