| 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 void Frame::trace(Visitor* visitor) | 68 void Frame::trace(Visitor* visitor) |
| 69 { | 69 { |
| 70 visitor->trace(m_treeNode); | 70 visitor->trace(m_treeNode); |
| 71 visitor->trace(m_host); | 71 visitor->trace(m_host); |
| 72 visitor->trace(m_owner); | 72 visitor->trace(m_owner); |
| 73 } | 73 } |
| 74 | 74 |
| 75 void Frame::detach() | 75 void Frame::detach() |
| 76 { | 76 { |
| 77 ASSERT(m_client); | 77 ASSERT(m_client); |
| 78 domWindow()->resetLocation(); |
| 78 disconnectOwnerElement(); | 79 disconnectOwnerElement(); |
| 79 // After this, we must no longer talk to the client since this clears | 80 // After this, we must no longer talk to the client since this clears |
| 80 // its owning reference back to our owning LocalFrame. | 81 // its owning reference back to our owning LocalFrame. |
| 81 m_client->detached(); | 82 m_client->detached(); |
| 82 m_client = nullptr; | 83 m_client = nullptr; |
| 83 m_host = nullptr; | 84 m_host = nullptr; |
| 84 } | 85 } |
| 85 | 86 |
| 86 void Frame::detachChildren() | 87 void Frame::detachChildren() |
| 87 { | 88 { |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 301 | 302 |
| 302 if (m_owner) { | 303 if (m_owner) { |
| 303 if (m_owner->isLocal()) | 304 if (m_owner->isLocal()) |
| 304 toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this); | 305 toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this); |
| 305 } else { | 306 } else { |
| 306 page()->setMainFrame(this); | 307 page()->setMainFrame(this); |
| 307 } | 308 } |
| 308 } | 309 } |
| 309 | 310 |
| 310 } // namespace blink | 311 } // namespace blink |
| OLD | NEW |