| OLD | NEW |
| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 | 57 |
| 58 Frame::~Frame() { | 58 Frame::~Frame() { |
| 59 InstanceCounters::decrementCounter(InstanceCounters::FrameCounter); | 59 InstanceCounters::decrementCounter(InstanceCounters::FrameCounter); |
| 60 ASSERT(!m_owner); | 60 ASSERT(!m_owner); |
| 61 } | 61 } |
| 62 | 62 |
| 63 DEFINE_TRACE(Frame) { | 63 DEFINE_TRACE(Frame) { |
| 64 visitor->trace(m_treeNode); | 64 visitor->trace(m_treeNode); |
| 65 visitor->trace(m_host); | 65 visitor->trace(m_host); |
| 66 visitor->trace(m_owner); | 66 visitor->trace(m_owner); |
| 67 visitor->trace(m_domWindow); |
| 67 visitor->trace(m_client); | 68 visitor->trace(m_client); |
| 68 } | 69 } |
| 69 | 70 |
| 70 void Frame::detach(FrameDetachType type) { | 71 void Frame::detach(FrameDetachType type) { |
| 71 ASSERT(m_client); | 72 ASSERT(m_client); |
| 72 m_client->setOpener(0); | 73 m_client->setOpener(0); |
| 73 domWindow()->resetLocation(); | 74 domWindow()->resetLocation(); |
| 74 disconnectOwnerElement(); | 75 disconnectOwnerElement(); |
| 75 // 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 |
| 76 // its owning reference back to our owning LocalFrame. | 77 // its owning reference back to our owning LocalFrame. |
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 344 | 345 |
| 345 ASSERT(page()); | 346 ASSERT(page()); |
| 346 | 347 |
| 347 if (m_owner) | 348 if (m_owner) |
| 348 m_owner->setContentFrame(*this); | 349 m_owner->setContentFrame(*this); |
| 349 else | 350 else |
| 350 page()->setMainFrame(this); | 351 page()->setMainFrame(this); |
| 351 } | 352 } |
| 352 | 353 |
| 353 } // namespace blink | 354 } // namespace blink |
| OLD | NEW |