| 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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 if (Page* page = document().page()) { | 195 if (Page* page = document().page()) { |
| 196 if (received) | 196 if (received) |
| 197 page->focusController().setFocusedFrame(contentFrame()); | 197 page->focusController().setFocusedFrame(contentFrame()); |
| 198 else if (page->focusController().focusedFrame() == contentFrame()) // Fo
cus may have already been given to another frame, don't take it away. | 198 else if (page->focusController().focusedFrame() == contentFrame()) // Fo
cus may have already been given to another frame, don't take it away. |
| 199 page->focusController().setFocusedFrame(0); | 199 page->focusController().setFocusedFrame(0); |
| 200 } | 200 } |
| 201 } | 201 } |
| 202 | 202 |
| 203 bool HTMLFrameElementBase::isURLAttribute(const Attribute& attribute) const | 203 bool HTMLFrameElementBase::isURLAttribute(const Attribute& attribute) const |
| 204 { | 204 { |
| 205 return attribute.name() == srcAttr || HTMLFrameOwnerElement::isURLAttribute(
attribute); | 205 return attribute.name() == longdescAttr || attribute.name() == srcAttr |
| 206 || HTMLFrameOwnerElement::isURLAttribute(attribute); |
| 206 } | 207 } |
| 207 | 208 |
| 208 bool HTMLFrameElementBase::isHTMLContentAttribute(const Attribute& attribute) co
nst | 209 bool HTMLFrameElementBase::isHTMLContentAttribute(const Attribute& attribute) co
nst |
| 209 { | 210 { |
| 210 return attribute.name() == srcdocAttr || HTMLFrameOwnerElement::isHTMLConten
tAttribute(attribute); | 211 return attribute.name() == srcdocAttr || HTMLFrameOwnerElement::isHTMLConten
tAttribute(attribute); |
| 211 } | 212 } |
| 212 | 213 |
| 213 int HTMLFrameElementBase::width() | 214 int HTMLFrameElementBase::width() |
| 214 { | 215 { |
| 215 document().updateLayoutIgnorePendingStylesheets(); | 216 document().updateLayoutIgnorePendingStylesheets(); |
| 216 if (!renderBox()) | 217 if (!renderBox()) |
| 217 return 0; | 218 return 0; |
| 218 return renderBox()->width(); | 219 return renderBox()->width(); |
| 219 } | 220 } |
| 220 | 221 |
| 221 int HTMLFrameElementBase::height() | 222 int HTMLFrameElementBase::height() |
| 222 { | 223 { |
| 223 document().updateLayoutIgnorePendingStylesheets(); | 224 document().updateLayoutIgnorePendingStylesheets(); |
| 224 if (!renderBox()) | 225 if (!renderBox()) |
| 225 return 0; | 226 return 0; |
| 226 return renderBox()->height(); | 227 return renderBox()->height(); |
| 227 } | 228 } |
| 228 | 229 |
| 229 } // namespace WebCore | 230 } // namespace WebCore |
| OLD | NEW |