| 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 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 DEFINE_TRACE(Frame) | 76 DEFINE_TRACE(Frame) |
| 77 { | 77 { |
| 78 visitor->trace(m_treeNode); | 78 visitor->trace(m_treeNode); |
| 79 visitor->trace(m_host); | 79 visitor->trace(m_host); |
| 80 visitor->trace(m_owner); | 80 visitor->trace(m_owner); |
| 81 } | 81 } |
| 82 | 82 |
| 83 void Frame::detach(FrameDetachType type) | 83 void Frame::detach(FrameDetachType type) |
| 84 { | 84 { |
| 85 ASSERT(m_client); | 85 ASSERT(m_client); |
| 86 m_client->setOpener(0); |
| 86 domWindow()->resetLocation(); | 87 domWindow()->resetLocation(); |
| 87 disconnectOwnerElement(); | 88 disconnectOwnerElement(); |
| 88 // After this, we must no longer talk to the client since this clears | 89 // After this, we must no longer talk to the client since this clears |
| 89 // its owning reference back to our owning LocalFrame. | 90 // its owning reference back to our owning LocalFrame. |
| 90 m_client->detached(type); | 91 m_client->detached(type); |
| 91 m_client = nullptr; | 92 m_client = nullptr; |
| 92 m_host = nullptr; | 93 m_host = nullptr; |
| 93 } | 94 } |
| 94 | 95 |
| 95 void Frame::detachChildren() | 96 void Frame::detachChildren() |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 | 303 |
| 303 if (m_owner) { | 304 if (m_owner) { |
| 304 if (m_owner->isLocal()) | 305 if (m_owner->isLocal()) |
| 305 toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this); | 306 toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this); |
| 306 } else { | 307 } else { |
| 307 page()->setMainFrame(this); | 308 page()->setMainFrame(this); |
| 308 } | 309 } |
| 309 } | 310 } |
| 310 | 311 |
| 311 } // namespace blink | 312 } // namespace blink |
| OLD | NEW |