| 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, 2009 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2006, 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 void HTMLFrameElement::attachLayoutTree(const AttachContext& context) { | 55 void HTMLFrameElement::attachLayoutTree(const AttachContext& context) { |
| 56 HTMLFrameElementBase::attachLayoutTree(context); | 56 HTMLFrameElementBase::attachLayoutTree(context); |
| 57 | 57 |
| 58 if (HTMLFrameSetElement* frameSetElement = | 58 if (HTMLFrameSetElement* frameSetElement = |
| 59 Traversal<HTMLFrameSetElement>::firstAncestor(*this)) { | 59 Traversal<HTMLFrameSetElement>::firstAncestor(*this)) { |
| 60 if (!m_frameBorderSet) | 60 if (!m_frameBorderSet) |
| 61 m_frameBorder = frameSetElement->hasFrameBorder(); | 61 m_frameBorder = frameSetElement->hasFrameBorder(); |
| 62 } | 62 } |
| 63 } | 63 } |
| 64 | 64 |
| 65 void HTMLFrameElement::parseAttribute(const QualifiedName& name, | 65 void HTMLFrameElement::parseAttribute( |
| 66 const AtomicString& oldValue, | 66 const AttributeModificationParams& params) { |
| 67 const AtomicString& value) { | 67 if (params.name == frameborderAttr) { |
| 68 if (name == frameborderAttr) { | 68 m_frameBorder = params.newValue.toInt(); |
| 69 m_frameBorder = value.toInt(); | 69 m_frameBorderSet = !params.newValue.isNull(); |
| 70 m_frameBorderSet = !value.isNull(); | |
| 71 // FIXME: If we are already attached, this has no effect. | 70 // FIXME: If we are already attached, this has no effect. |
| 72 } else if (name == noresizeAttr) { | 71 } else if (params.name == noresizeAttr) { |
| 73 if (layoutObject()) | 72 if (layoutObject()) |
| 74 layoutObject()->updateFromElement(); | 73 layoutObject()->updateFromElement(); |
| 75 } else { | 74 } else { |
| 76 HTMLFrameElementBase::parseAttribute(name, oldValue, value); | 75 HTMLFrameElementBase::parseAttribute(params); |
| 77 } | 76 } |
| 78 } | 77 } |
| 79 | 78 |
| 80 } // namespace blink | 79 } // namespace blink |
| OLD | NEW |