| 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 page()->incrementSubframeCount(); | 74 page()->incrementSubframeCount(); |
| 75 if (m_owner->isLocal()) | 75 if (m_owner->isLocal()) |
| 76 toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this); | 76 toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this); |
| 77 } else { | 77 } else { |
| 78 page()->setMainFrame(this); | 78 page()->setMainFrame(this); |
| 79 } | 79 } |
| 80 } | 80 } |
| 81 | 81 |
| 82 Frame::~Frame() | 82 Frame::~Frame() |
| 83 { | 83 { |
| 84 #if ENABLE(OILPAN) |
| 85 ASSERT(!m_owner); |
| 86 #else |
| 84 // FIXME: We should not be doing all this work inside the destructor | 87 // FIXME: We should not be doing all this work inside the destructor |
| 85 #if !ENABLE(OILPAN) | |
| 86 disconnectOwnerElement(); | 88 disconnectOwnerElement(); |
| 87 setDOMWindow(nullptr); | 89 setDOMWindow(nullptr); |
| 88 #endif | 90 #endif |
| 89 | 91 |
| 90 #ifndef NDEBUG | 92 #ifndef NDEBUG |
| 91 frameCounter.decrement(); | 93 frameCounter.decrement(); |
| 92 #endif | 94 #endif |
| 93 } | 95 } |
| 94 | 96 |
| 95 void Frame::trace(Visitor* visitor) | 97 void Frame::trace(Visitor* visitor) |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 } | 211 } |
| 210 m_owner = nullptr; | 212 m_owner = nullptr; |
| 211 } | 213 } |
| 212 | 214 |
| 213 HTMLFrameOwnerElement* Frame::deprecatedLocalOwner() const | 215 HTMLFrameOwnerElement* Frame::deprecatedLocalOwner() const |
| 214 { | 216 { |
| 215 return m_owner && m_owner->isLocal() ? toHTMLFrameOwnerElement(m_owner) : 0; | 217 return m_owner && m_owner->isLocal() ? toHTMLFrameOwnerElement(m_owner) : 0; |
| 216 } | 218 } |
| 217 | 219 |
| 218 } // namespace blink | 220 } // namespace blink |
| OLD | NEW |