Chromium Code Reviews| 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 66 ASSERT(page()); | 66 ASSERT(page()); |
| 67 | 67 |
| 68 #ifndef NDEBUG | 68 #ifndef NDEBUG |
| 69 frameCounter.increment(); | 69 frameCounter.increment(); |
| 70 #endif | 70 #endif |
| 71 | 71 |
| 72 if (m_owner) { | 72 if (m_owner) { |
| 73 page()->incrementSubframeCount(); | 73 page()->incrementSubframeCount(); |
| 74 if (m_owner->isLocal()) | 74 if (m_owner->isLocal()) |
| 75 toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this); | 75 toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this); |
| 76 } else { | |
| 77 // Setting the main frame takes a reference to this object, before it's | |
| 78 // adopted. | |
| 79 relaxAdoptionRequirement(); | |
|
eseidel
2014/06/17 18:00:29
I find it difficult to imagine why this function e
| |
| 80 page()->setMainFrame(this); | |
| 76 } | 81 } |
| 77 } | 82 } |
| 78 | 83 |
| 79 Frame::~Frame() | 84 Frame::~Frame() |
| 80 { | 85 { |
| 81 disconnectOwnerElement(); | 86 disconnectOwnerElement(); |
| 82 setDOMWindow(nullptr); | 87 setDOMWindow(nullptr); |
| 83 | 88 |
| 84 // FIXME: We should not be doing all this work inside the destructor | 89 // FIXME: We should not be doing all this work inside the destructor |
| 85 | 90 |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 187 if (m_owner) { | 192 if (m_owner) { |
| 188 if (m_owner->isLocal()) | 193 if (m_owner->isLocal()) |
| 189 toHTMLFrameOwnerElement(m_owner)->clearContentFrame(); | 194 toHTMLFrameOwnerElement(m_owner)->clearContentFrame(); |
| 190 if (page()) | 195 if (page()) |
| 191 page()->decrementSubframeCount(); | 196 page()->decrementSubframeCount(); |
| 192 } | 197 } |
| 193 m_owner = 0; | 198 m_owner = 0; |
| 194 } | 199 } |
| 195 | 200 |
| 196 } // namespace WebCore | 201 } // namespace WebCore |
| OLD | NEW |