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

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

Issue 2704133002: Associate Location with DOMWindow instead of Frame. (Closed)
Patch Set: fix typos, consistent naming Created 3 years, 10 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
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 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
9 * rights reserved. 9 * rights reserved.
10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 visitor->trace(m_treeNode); 65 visitor->trace(m_treeNode);
66 visitor->trace(m_host); 66 visitor->trace(m_host);
67 visitor->trace(m_owner); 67 visitor->trace(m_owner);
68 visitor->trace(m_domWindow); 68 visitor->trace(m_domWindow);
69 visitor->trace(m_client); 69 visitor->trace(m_client);
70 } 70 }
71 71
72 void Frame::detach(FrameDetachType type) { 72 void Frame::detach(FrameDetachType type) {
73 ASSERT(m_client); 73 ASSERT(m_client);
74 m_client->setOpener(0); 74 m_client->setOpener(0);
75 domWindow()->resetLocation();
76 disconnectOwnerElement(); 75 disconnectOwnerElement();
77 // After this, we must no longer talk to the client since this clears 76 // After this, we must no longer talk to the client since this clears
78 // its owning reference back to our owning LocalFrame. 77 // its owning reference back to our owning LocalFrame.
79 m_client->detached(type); 78 m_client->detached(type);
80 m_client = nullptr; 79 m_client = nullptr;
81 m_host = nullptr; 80 m_host = nullptr;
82 } 81 }
83 82
84 void Frame::disconnectOwnerElement() { 83 void Frame::disconnectOwnerElement() {
85 if (m_owner) { 84 if (m_owner) {
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 414
416 ASSERT(page()); 415 ASSERT(page());
417 416
418 if (m_owner) 417 if (m_owner)
419 m_owner->setContentFrame(*this); 418 m_owner->setContentFrame(*this);
420 else 419 else
421 page()->setMainFrame(this); 420 page()->setMainFrame(this);
422 } 421 }
423 422
424 } // namespace blink 423 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698