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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 , m_remotePlatformLayer(0) | 64 , m_remotePlatformLayer(0) |
65 { | 65 { |
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 m_owner->setContentFrame(*this); |
75 toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this); | |
76 } | 75 } |
77 } | 76 } |
78 | 77 |
79 Frame::~Frame() | 78 Frame::~Frame() |
80 { | 79 { |
81 disconnectOwnerElement(); | 80 disconnectOwnerElement(); |
82 setDOMWindow(nullptr); | 81 setDOMWindow(nullptr); |
83 | 82 |
84 // FIXME: We should not be doing all this work inside the destructor | 83 // FIXME: We should not be doing all this work inside the destructor |
85 | 84 |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
178 | 177 |
179 bool Frame::isMainFrame() const | 178 bool Frame::isMainFrame() const |
180 { | 179 { |
181 Page* page = this->page(); | 180 Page* page = this->page(); |
182 return page && this == page->mainFrame(); | 181 return page && this == page->mainFrame(); |
183 } | 182 } |
184 | 183 |
185 void Frame::disconnectOwnerElement() | 184 void Frame::disconnectOwnerElement() |
186 { | 185 { |
187 if (m_owner) { | 186 if (m_owner) { |
188 if (m_owner->isLocal()) | 187 m_owner->clearContentFrame(); |
189 toHTMLFrameOwnerElement(m_owner)->clearContentFrame(); | |
190 if (page()) | 188 if (page()) |
191 page()->decrementSubframeCount(); | 189 page()->decrementSubframeCount(); |
192 } | 190 } |
193 m_owner = 0; | 191 m_owner = 0; |
194 } | 192 } |
195 | 193 |
196 } // namespace WebCore | 194 } // namespace WebCore |
OLD | NEW |