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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 if (!SubframeLoadingDisabler::canLoadFrame(*this)) | 156 if (!SubframeLoadingDisabler::canLoadFrame(*this)) |
157 return; | 157 return; |
158 | 158 |
159 setNameAndOpenURL(); | 159 setNameAndOpenURL(); |
160 } | 160 } |
161 | 161 |
162 void HTMLFrameElementBase::attach(const AttachContext& context) | 162 void HTMLFrameElementBase::attach(const AttachContext& context) |
163 { | 163 { |
164 HTMLFrameOwnerElement::attach(context); | 164 HTMLFrameOwnerElement::attach(context); |
165 | 165 |
166 if (RenderPart* part = renderPart()) { | 166 if (renderPart()) { |
167 if (Frame* frame = contentFrame()) | 167 if (Frame* frame = contentFrame()) |
168 part->setWidget(frame->view()); | 168 setWidget(frame->view()); |
169 } | 169 } |
170 } | 170 } |
171 | 171 |
172 KURL HTMLFrameElementBase::location() const | 172 KURL HTMLFrameElementBase::location() const |
173 { | 173 { |
174 if (fastHasAttribute(srcdocAttr)) | 174 if (fastHasAttribute(srcdocAttr)) |
175 return KURL(ParsedURLString, "about:srcdoc"); | 175 return KURL(ParsedURLString, "about:srcdoc"); |
176 return document().completeURL(getAttribute(srcAttr)); | 176 return document().completeURL(getAttribute(srcAttr)); |
177 } | 177 } |
178 | 178 |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
221 | 221 |
222 int HTMLFrameElementBase::height() | 222 int HTMLFrameElementBase::height() |
223 { | 223 { |
224 document().updateLayoutIgnorePendingStylesheets(); | 224 document().updateLayoutIgnorePendingStylesheets(); |
225 if (!renderBox()) | 225 if (!renderBox()) |
226 return 0; | 226 return 0; |
227 return renderBox()->height(); | 227 return renderBox()->height(); |
228 } | 228 } |
229 | 229 |
230 } // namespace WebCore | 230 } // namespace WebCore |
OLD | NEW |