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

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

Issue 657263002: Disallow script execution after unload event dispatch in frame detach. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 2 months 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/frame/RemoteFrame.cpp » ('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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 void Frame::trace(Visitor* visitor) 94 void Frame::trace(Visitor* visitor)
95 { 95 {
96 visitor->trace(m_treeNode); 96 visitor->trace(m_treeNode);
97 visitor->trace(m_host); 97 visitor->trace(m_host);
98 visitor->trace(m_owner); 98 visitor->trace(m_owner);
99 visitor->trace(m_domWindow); 99 visitor->trace(m_domWindow);
100 } 100 }
101 101
102 void Frame::detach() 102 void Frame::detach()
103 { 103 {
104 // client() should never be null because that means we somehow re-entered 104 ASSERT(m_client);
105 // the frame detach code... but it is sometimes.
106 // FIXME: Understand why this is happening so we can document this insanity.
107 // http://crbug.com/371084 is a probable explanation.
108 if (!client())
109 return;
110 disconnectOwnerElement(); 105 disconnectOwnerElement();
111 // After this, we must no longer talk to the client since this clears 106 // After this, we must no longer talk to the client since this clears
112 // its owning reference back to our owning LocalFrame. 107 // its owning reference back to our owning LocalFrame.
113 m_client->detached(); 108 m_client->detached();
114 m_client = nullptr; 109 m_client = nullptr;
115 m_host = nullptr; 110 m_host = nullptr;
116 } 111 }
117 112
118 void Frame::detachChildren() 113 void Frame::detachChildren()
119 { 114 {
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 } 216 }
222 m_owner = nullptr; 217 m_owner = nullptr;
223 } 218 }
224 219
225 HTMLFrameOwnerElement* Frame::deprecatedLocalOwner() const 220 HTMLFrameOwnerElement* Frame::deprecatedLocalOwner() const
226 { 221 {
227 return m_owner && m_owner->isLocal() ? toHTMLFrameOwnerElement(m_owner) : 0; 222 return m_owner && m_owner->isLocal() ? toHTMLFrameOwnerElement(m_owner) : 0;
228 } 223 }
229 224
230 } // namespace blink 225 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/frame/RemoteFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698