| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1997 Martin Jones (mjones@kde.org) | 2 * Copyright (C) 1997 Martin Jones (mjones@kde.org) |
| 3 * (C) 1997 Torben Weis (weis@kde.org) | 3 * (C) 1997 Torben Weis (weis@kde.org) |
| 4 * (C) 1998 Waldo Bastian (bastian@kde.org) | 4 * (C) 1998 Waldo Bastian (bastian@kde.org) |
| 5 * (C) 1999 Lars Knoll (knoll@kde.org) | 5 * (C) 1999 Lars Knoll (knoll@kde.org) |
| 6 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 6 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 7 * Copyright (C) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved. | 7 * Copyright (C) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved. |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 int heightInt = value.toInt(); | 102 int heightInt = value.toInt(); |
| 103 if (heightInt > 0) // height="0" is ignored for compatibility with WinIE. | 103 if (heightInt > 0) // height="0" is ignored for compatibility with WinIE. |
| 104 addHTMLLengthToStyle(style, CSSPropertyHeight, value); | 104 addHTMLLengthToStyle(style, CSSPropertyHeight, value); |
| 105 } | 105 } |
| 106 } else { | 106 } else { |
| 107 HTMLTablePartElement::collectStyleForPresentationAttribute(name, value, | 107 HTMLTablePartElement::collectStyleForPresentationAttribute(name, value, |
| 108 style); | 108 style); |
| 109 } | 109 } |
| 110 } | 110 } |
| 111 | 111 |
| 112 void HTMLTableCellElement::parseAttribute(const QualifiedName& name, | 112 void HTMLTableCellElement::parseAttribute( |
| 113 const AtomicString& oldValue, | 113 const AttributeModificationParams& params) { |
| 114 const AtomicString& value) { | 114 if (params.name == rowspanAttr || params.name == colspanAttr) { |
| 115 if (name == rowspanAttr || name == colspanAttr) { | |
| 116 if (layoutObject() && layoutObject()->isTableCell()) | 115 if (layoutObject() && layoutObject()->isTableCell()) |
| 117 toLayoutTableCell(layoutObject())->colSpanOrRowSpanChanged(); | 116 toLayoutTableCell(layoutObject())->colSpanOrRowSpanChanged(); |
| 118 } else { | 117 } else { |
| 119 HTMLTablePartElement::parseAttribute(name, oldValue, value); | 118 HTMLTablePartElement::parseAttribute(params); |
| 120 } | 119 } |
| 121 } | 120 } |
| 122 | 121 |
| 123 const StylePropertySet* | 122 const StylePropertySet* |
| 124 HTMLTableCellElement::additionalPresentationAttributeStyle() { | 123 HTMLTableCellElement::additionalPresentationAttributeStyle() { |
| 125 if (HTMLTableElement* table = findParentTable()) | 124 if (HTMLTableElement* table = findParentTable()) |
| 126 return table->additionalCellStyle(); | 125 return table->additionalCellStyle(); |
| 127 return nullptr; | 126 return nullptr; |
| 128 } | 127 } |
| 129 | 128 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 157 | 156 |
| 158 const AtomicString& HTMLTableCellElement::headers() const { | 157 const AtomicString& HTMLTableCellElement::headers() const { |
| 159 return fastGetAttribute(headersAttr); | 158 return fastGetAttribute(headersAttr); |
| 160 } | 159 } |
| 161 | 160 |
| 162 void HTMLTableCellElement::setRowSpan(unsigned n) { | 161 void HTMLTableCellElement::setRowSpan(unsigned n) { |
| 163 setUnsignedIntegralAttribute(rowspanAttr, n); | 162 setUnsignedIntegralAttribute(rowspanAttr, n); |
| 164 } | 163 } |
| 165 | 164 |
| 166 } // namespace blink | 165 } // namespace blink |
| OLD | NEW |