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 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 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 302 // signalled the Inspector frameWindowDiscarded() notifications. | 302 // signalled the Inspector frameWindowDiscarded() notifications. |
| 303 // We assume that all LocalFrames are detached, where that notification | 303 // We assume that all LocalFrames are detached, where that notification |
| 304 // will have been done. | 304 // will have been done. |
| 305 // | 305 // |
| 306 // - Calling LocalDOMWindow::reset() is not needed (called from | 306 // - Calling LocalDOMWindow::reset() is not needed (called from |
| 307 // Frame::setDOMWindow().) The Member references it clears will now | 307 // Frame::setDOMWindow().) The Member references it clears will now |
| 308 // die with the window. And the registered DOMWindowProperty instances th at don't, | 308 // die with the window. And the registered DOMWindowProperty instances th at don't, |
| 309 // only keep a weak reference to this frame, so there's no need to be | 309 // only keep a weak reference to this frame, so there's no need to be |
| 310 // explicitly notified that this frame is going away. | 310 // explicitly notified that this frame is going away. |
| 311 if (m_domWindow) { | 311 if (m_domWindow) { |
| 312 console().messageStorage()->frameWindowDiscarded(m_domWindow.get()); | 312 if (host()) |
| 313 host()->consoleMessageStorage().frameWindowDiscarded(m_domWindow.get ()); | |
| 313 InspectorInstrumentation::frameWindowDiscarded(this, m_domWindow.get()); | 314 InspectorInstrumentation::frameWindowDiscarded(this, m_domWindow.get()); |
|
vsevik
2014/10/14 14:34:08
I think this should not be called when host() is n
kozyatinskiy1
2014/10/14 17:17:01
Acknowledged.
| |
| 314 } | 315 } |
| 315 if (domWindow) | 316 if (domWindow) |
| 316 script().clearWindowProxy(); | 317 script().clearWindowProxy(); |
| 317 Frame::setDOMWindow(domWindow); | 318 Frame::setDOMWindow(domWindow); |
| 318 } | 319 } |
| 319 | 320 |
| 320 void LocalFrame::didChangeVisibilityState() | 321 void LocalFrame::didChangeVisibilityState() |
| 321 { | 322 { |
| 322 if (document()) | 323 if (document()) |
| 323 document()->didChangeVisibilityState(); | 324 document()->didChangeVisibilityState(); |
| (...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 779 } | 780 } |
| 780 | 781 |
| 781 void LocalFrame::unregisterPluginElement(HTMLPlugInElement* plugin) | 782 void LocalFrame::unregisterPluginElement(HTMLPlugInElement* plugin) |
| 782 { | 783 { |
| 783 ASSERT(m_pluginElements.contains(plugin)); | 784 ASSERT(m_pluginElements.contains(plugin)); |
| 784 m_pluginElements.remove(plugin); | 785 m_pluginElements.remove(plugin); |
| 785 } | 786 } |
| 786 #endif | 787 #endif |
| 787 | 788 |
| 788 } // namespace blink | 789 } // namespace blink |
| OLD | NEW |