Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(293)

Side by Side Diff: Source/core/frame/LocalFrame.cpp

Issue 686763002: Fix Runtime.executionContextCreated for crafted iframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 // - FrameDestructionObserver::willDetachFrameHost() will have 333 // - FrameDestructionObserver::willDetachFrameHost() will have
334 // signalled the Inspector frameWindowDiscarded() notifications. 334 // signalled the Inspector frameWindowDiscarded() notifications.
335 // We assume that all LocalFrames are detached, where that notification 335 // We assume that all LocalFrames are detached, where that notification
336 // will have been done. 336 // will have been done.
337 // 337 //
338 // - Calling LocalDOMWindow::reset() is not needed (called from 338 // - Calling LocalDOMWindow::reset() is not needed (called from
339 // Frame::setDOMWindow().) The Member references it clears will now 339 // Frame::setDOMWindow().) The Member references it clears will now
340 // die with the window. And the registered DOMWindowProperty instances th at don't, 340 // die with the window. And the registered DOMWindowProperty instances th at don't,
341 // only keep a weak reference to this frame, so there's no need to be 341 // only keep a weak reference to this frame, so there's no need to be
342 // explicitly notified that this frame is going away. 342 // explicitly notified that this frame is going away.
343 if (m_domWindow && host()) { 343 if (m_domWindow && host())
344 host()->consoleMessageStorage().frameWindowDiscarded(m_domWindow.get()); 344 host()->consoleMessageStorage().frameWindowDiscarded(m_domWindow.get());
345 InspectorInstrumentation::frameWindowDiscarded(this, m_domWindow.get());
346 }
347 if (domWindow) 345 if (domWindow)
348 script().clearWindowProxy(); 346 script().clearWindowProxy();
349 347
350 if (m_domWindow) 348 if (m_domWindow)
351 m_domWindow->reset(); 349 m_domWindow->reset();
352 m_domWindow = domWindow; 350 m_domWindow = domWindow;
353 } 351 }
354 352
355 Document* LocalFrame::document() const 353 Document* LocalFrame::document() const
356 { 354 {
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 // We detach the FrameView's custom scroll bars as early as 786 // We detach the FrameView's custom scroll bars as early as
789 // possible to prevent m_doc->detach() from messing with the view 787 // possible to prevent m_doc->detach() from messing with the view
790 // such that its scroll bars won't be torn down. 788 // such that its scroll bars won't be torn down.
791 // 789 //
792 // FIXME: We should revisit this. 790 // FIXME: We should revisit this.
793 if (m_view) 791 if (m_view)
794 m_view->prepareForDetach(); 792 m_view->prepareForDetach();
795 } 793 }
796 794
797 } // namespace blink 795 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698