| 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 #include "core/fetch/ResourceFetcher.h" | 43 #include "core/fetch/ResourceFetcher.h" |
| 44 #include "core/frame/EventHandlerRegistry.h" | 44 #include "core/frame/EventHandlerRegistry.h" |
| 45 #include "core/frame/FrameConsole.h" | 45 #include "core/frame/FrameConsole.h" |
| 46 #include "core/frame/FrameHost.h" | 46 #include "core/frame/FrameHost.h" |
| 47 #include "core/frame/FrameView.h" | 47 #include "core/frame/FrameView.h" |
| 48 #include "core/frame/LocalDOMWindow.h" | 48 #include "core/frame/LocalDOMWindow.h" |
| 49 #include "core/frame/Settings.h" | 49 #include "core/frame/Settings.h" |
| 50 #include "core/html/HTMLFrameElementBase.h" | 50 #include "core/html/HTMLFrameElementBase.h" |
| 51 #include "core/html/HTMLPlugInElement.h" | 51 #include "core/html/HTMLPlugInElement.h" |
| 52 #include "core/input/EventHandler.h" | 52 #include "core/input/EventHandler.h" |
| 53 #include "core/inspector/ConsoleMessageStorage.h" | |
| 54 #include "core/inspector/InspectorInstrumentation.h" | 53 #include "core/inspector/InspectorInstrumentation.h" |
| 55 #include "core/layout/HitTestResult.h" | 54 #include "core/layout/HitTestResult.h" |
| 56 #include "core/layout/LayoutView.h" | 55 #include "core/layout/LayoutView.h" |
| 57 #include "core/layout/api/LayoutViewItem.h" | 56 #include "core/layout/api/LayoutViewItem.h" |
| 58 #include "core/layout/compositing/PaintLayerCompositor.h" | 57 #include "core/layout/compositing/PaintLayerCompositor.h" |
| 59 #include "core/loader/FrameLoadRequest.h" | 58 #include "core/loader/FrameLoadRequest.h" |
| 60 #include "core/loader/FrameLoaderClient.h" | 59 #include "core/loader/FrameLoaderClient.h" |
| 61 #include "core/loader/NavigationScheduler.h" | 60 #include "core/loader/NavigationScheduler.h" |
| 62 #include "core/page/ChromeClient.h" | 61 #include "core/page/ChromeClient.h" |
| 63 #include "core/page/FocusController.h" | 62 #include "core/page/FocusController.h" |
| (...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 411 // - LocalFrameLifecycleObserver::willDetachFrameHost() will have | 410 // - LocalFrameLifecycleObserver::willDetachFrameHost() will have |
| 412 // signalled the Inspector frameWindowDiscarded() notifications. | 411 // signalled the Inspector frameWindowDiscarded() notifications. |
| 413 // We assume that all LocalFrames are detached, where that notification | 412 // We assume that all LocalFrames are detached, where that notification |
| 414 // will have been done. | 413 // will have been done. |
| 415 // | 414 // |
| 416 // - Calling LocalDOMWindow::reset() is not needed (called from | 415 // - Calling LocalDOMWindow::reset() is not needed (called from |
| 417 // Frame::setDOMWindow().) The Member references it clears will now | 416 // Frame::setDOMWindow().) The Member references it clears will now |
| 418 // die with the window. And the registered DOMWindowProperty instances th
at don't, | 417 // die with the window. And the registered DOMWindowProperty instances th
at don't, |
| 419 // only keep a weak reference to this frame, so there's no need to be | 418 // only keep a weak reference to this frame, so there's no need to be |
| 420 // explicitly notified that this frame is going away. | 419 // explicitly notified that this frame is going away. |
| 421 if (m_domWindow && host()) | |
| 422 host()->consoleMessageStorage().frameWindowDiscarded(m_domWindow.get()); | |
| 423 if (domWindow) | 420 if (domWindow) |
| 424 script().clearWindowProxy(); | 421 script().clearWindowProxy(); |
| 425 | 422 |
| 426 if (m_domWindow) | 423 if (m_domWindow) |
| 427 m_domWindow->reset(); | 424 m_domWindow->reset(); |
| 428 m_domWindow = domWindow; | 425 m_domWindow = domWindow; |
| 429 } | 426 } |
| 430 | 427 |
| 431 Document* LocalFrame::document() const | 428 Document* LocalFrame::document() const |
| 432 { | 429 { |
| (...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 816 m_frame->client()->frameBlameContext()->Enter(); | 813 m_frame->client()->frameBlameContext()->Enter(); |
| 817 } | 814 } |
| 818 | 815 |
| 819 ScopedFrameBlamer::~ScopedFrameBlamer() | 816 ScopedFrameBlamer::~ScopedFrameBlamer() |
| 820 { | 817 { |
| 821 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 818 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 822 m_frame->client()->frameBlameContext()->Leave(); | 819 m_frame->client()->frameBlameContext()->Leave(); |
| 823 } | 820 } |
| 824 | 821 |
| 825 } // namespace blink | 822 } // namespace blink |
| OLD | NEW |