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

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: rebase Created 6 years 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
« no previous file with comments | « Source/core/frame/LocalDOMWindow.cpp ('k') | Source/core/inspector/InjectedScriptManager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 // - FrameDestructionObserver::willDetachFrameHost() will have 338 // - FrameDestructionObserver::willDetachFrameHost() will have
339 // signalled the Inspector frameWindowDiscarded() notifications. 339 // signalled the Inspector frameWindowDiscarded() notifications.
340 // We assume that all LocalFrames are detached, where that notification 340 // We assume that all LocalFrames are detached, where that notification
341 // will have been done. 341 // will have been done.
342 // 342 //
343 // - Calling LocalDOMWindow::reset() is not needed (called from 343 // - Calling LocalDOMWindow::reset() is not needed (called from
344 // Frame::setDOMWindow().) The Member references it clears will now 344 // Frame::setDOMWindow().) The Member references it clears will now
345 // die with the window. And the registered DOMWindowProperty instances th at don't, 345 // die with the window. And the registered DOMWindowProperty instances th at don't,
346 // only keep a weak reference to this frame, so there's no need to be 346 // only keep a weak reference to this frame, so there's no need to be
347 // explicitly notified that this frame is going away. 347 // explicitly notified that this frame is going away.
348 if (m_domWindow && host()) { 348 if (m_domWindow && host())
349 host()->consoleMessageStorage().frameWindowDiscarded(m_domWindow.get()); 349 host()->consoleMessageStorage().frameWindowDiscarded(m_domWindow.get());
350 InspectorInstrumentation::frameWindowDiscarded(this, m_domWindow.get());
351 }
352 if (domWindow) 350 if (domWindow)
353 script().clearWindowProxy(); 351 script().clearWindowProxy();
354 352
355 if (m_domWindow) 353 if (m_domWindow)
356 m_domWindow->reset(); 354 m_domWindow->reset();
357 m_domWindow = domWindow; 355 m_domWindow = domWindow;
358 } 356 }
359 357
360 Document* LocalFrame::document() const 358 Document* LocalFrame::document() const
361 { 359 {
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
785 // We detach the FrameView's custom scroll bars as early as 783 // We detach the FrameView's custom scroll bars as early as
786 // possible to prevent m_doc->detach() from messing with the view 784 // possible to prevent m_doc->detach() from messing with the view
787 // such that its scroll bars won't be torn down. 785 // such that its scroll bars won't be torn down.
788 // 786 //
789 // FIXME: We should revisit this. 787 // FIXME: We should revisit this.
790 if (m_view) 788 if (m_view)
791 m_view->prepareForDetach(); 789 m_view->prepareForDetach();
792 } 790 }
793 791
794 } // namespace blink 792 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/LocalDOMWindow.cpp ('k') | Source/core/inspector/InjectedScriptManager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698