| 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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 HTMLFrameOwnerElement::attach(context); | 159 HTMLFrameOwnerElement::attach(context); |
| 160 | 160 |
| 161 if (RenderPart* part = renderPart()) { | 161 if (RenderPart* part = renderPart()) { |
| 162 if (Frame* frame = contentFrame()) { | 162 if (Frame* frame = contentFrame()) { |
| 163 if (frame->isLocalFrame()) | 163 if (frame->isLocalFrame()) |
| 164 part->setWidget(toLocalFrame(frame)->view()); | 164 part->setWidget(toLocalFrame(frame)->view()); |
| 165 } | 165 } |
| 166 } | 166 } |
| 167 } | 167 } |
| 168 | 168 |
| 169 KURL HTMLFrameElementBase::location() const | |
| 170 { | |
| 171 if (fastHasAttribute(srcdocAttr)) | |
| 172 return KURL(ParsedURLString, "about:srcdoc"); | |
| 173 return document().completeURL(getAttribute(srcAttr)); | |
| 174 } | |
| 175 | |
| 176 void HTMLFrameElementBase::setLocation(const String& str) | 169 void HTMLFrameElementBase::setLocation(const String& str) |
| 177 { | 170 { |
| 178 m_URL = AtomicString(str); | 171 m_URL = AtomicString(str); |
| 179 | 172 |
| 180 if (inDocument()) | 173 if (inDocument()) |
| 181 openURL(false); | 174 openURL(false); |
| 182 } | 175 } |
| 183 | 176 |
| 184 bool HTMLFrameElementBase::supportsFocus() const | 177 bool HTMLFrameElementBase::supportsFocus() const |
| 185 { | 178 { |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 | 216 |
| 224 int HTMLFrameElementBase::height() | 217 int HTMLFrameElementBase::height() |
| 225 { | 218 { |
| 226 document().updateLayoutIgnorePendingStylesheets(); | 219 document().updateLayoutIgnorePendingStylesheets(); |
| 227 if (!renderBox()) | 220 if (!renderBox()) |
| 228 return 0; | 221 return 0; |
| 229 return renderBox()->height(); | 222 return renderBox()->height(); |
| 230 } | 223 } |
| 231 | 224 |
| 232 } // namespace WebCore | 225 } // namespace WebCore |
| OLD | NEW |