OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * (C) 2000 Simon Hausmann (hausmann@kde.org) | 4 * (C) 2000 Simon Hausmann (hausmann@kde.org) |
5 * (C) 2001 Dirk Mueller (mueller@kde.org) | 5 * (C) 2001 Dirk Mueller (mueller@kde.org) |
6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. |
7 * | 7 * |
8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
154 } | 154 } |
155 | 155 |
156 Node::InsertionNotificationRequest HTMLFrameElementBase::insertedInto(ContainerN
ode* insertionPoint) | 156 Node::InsertionNotificationRequest HTMLFrameElementBase::insertedInto(ContainerN
ode* insertionPoint) |
157 { | 157 { |
158 HTMLFrameOwnerElement::insertedInto(insertionPoint); | 158 HTMLFrameOwnerElement::insertedInto(insertionPoint); |
159 if (insertionPoint->inDocument()) | 159 if (insertionPoint->inDocument()) |
160 return InsertionShouldCallDidNotifySubtreeInsertions; | 160 return InsertionShouldCallDidNotifySubtreeInsertions; |
161 return InsertionDone; | 161 return InsertionDone; |
162 } | 162 } |
163 | 163 |
164 void HTMLFrameElementBase::didNotifySubtreeInsertions(ContainerNode* insertionPo
int) | 164 void HTMLFrameElementBase::didNotifySubtreeInsertions(ContainerNode*) |
165 { | 165 { |
166 ASSERT_UNUSED(insertionPoint, insertionPoint->inDocument()); | 166 if (!inDocument()) |
| 167 return; |
167 | 168 |
168 // DocumentFragments don't kick of any loads. | 169 // DocumentFragments don't kick of any loads. |
169 if (!document()->frame()) | 170 if (!document()->frame()) |
170 return; | 171 return; |
171 | 172 |
172 // JavaScript in src=javascript: and beforeonload can access the renderer | 173 // JavaScript in src=javascript: and beforeonload can access the renderer |
173 // during attribute parsing *before* the normal parser machinery would | 174 // during attribute parsing *before* the normal parser machinery would |
174 // attach the element. To support this, we lazyAttach here, but only | 175 // attach the element. To support this, we lazyAttach here, but only |
175 // if we don't already have a renderer (if we're inserted | 176 // if we don't already have a renderer (if we're inserted |
176 // as part of a DocumentFragment, insertedInto from an earlier element | 177 // as part of a DocumentFragment, insertedInto from an earlier element |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
240 | 241 |
241 int HTMLFrameElementBase::height() | 242 int HTMLFrameElementBase::height() |
242 { | 243 { |
243 document()->updateLayoutIgnorePendingStylesheets(); | 244 document()->updateLayoutIgnorePendingStylesheets(); |
244 if (!renderBox()) | 245 if (!renderBox()) |
245 return 0; | 246 return 0; |
246 return renderBox()->height(); | 247 return renderBox()->height(); |
247 } | 248 } |
248 | 249 |
249 } // namespace WebCore | 250 } // namespace WebCore |
OLD | NEW |