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

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

Issue 1437973002: Oilpan: turn Frame::m_client into the Member it is. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « third_party/WebKit/Source/core/frame/Frame.h ('k') | no next file » | 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 #ifndef NDEBUG 78 #ifndef NDEBUG
79 frameCounter().decrement(); 79 frameCounter().decrement();
80 #endif 80 #endif
81 } 81 }
82 82
83 DEFINE_TRACE(Frame) 83 DEFINE_TRACE(Frame)
84 { 84 {
85 visitor->trace(m_treeNode); 85 visitor->trace(m_treeNode);
86 visitor->trace(m_host); 86 visitor->trace(m_host);
87 visitor->trace(m_owner); 87 visitor->trace(m_owner);
88 visitor->trace(m_client);
88 } 89 }
89 90
90 void Frame::detach(FrameDetachType type) 91 void Frame::detach(FrameDetachType type)
91 { 92 {
92 ASSERT(m_client); 93 ASSERT(m_client);
93 m_client->setOpener(0); 94 m_client->setOpener(0);
94 domWindow()->resetLocation(); 95 domWindow()->resetLocation();
95 disconnectOwnerElement(); 96 disconnectOwnerElement();
96 // After this, we must no longer talk to the client since this clears 97 // After this, we must no longer talk to the client since this clears
97 // its owning reference back to our owning LocalFrame. 98 // its owning reference back to our owning LocalFrame.
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 313
313 if (m_owner) { 314 if (m_owner) {
314 if (m_owner->isLocal()) 315 if (m_owner->isLocal())
315 toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this); 316 toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this);
316 } else { 317 } else {
317 page()->setMainFrame(this); 318 page()->setMainFrame(this);
318 } 319 }
319 } 320 }
320 321
321 } // namespace blink 322 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/Frame.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698