| 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, 2009 Apple Inc. All rights reserved. | 7 * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved. |
| 8 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 8 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| 9 * | 9 * |
| 10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 RenderTable* table = this->table(); | 53 RenderTable* table = this->table(); |
| 54 if (table && !table->selfNeedsLayout() && !table->normalChildNeedsLayout
() && oldStyle && oldStyle->border() != style()->border()) | 54 if (table && !table->selfNeedsLayout() && !table->normalChildNeedsLayout
() && oldStyle && oldStyle->border() != style()->border()) |
| 55 table->invalidateCollapsedBorders(); | 55 table->invalidateCollapsedBorders(); |
| 56 } | 56 } |
| 57 } | 57 } |
| 58 | 58 |
| 59 void RenderTableCol::updateFromElement() | 59 void RenderTableCol::updateFromElement() |
| 60 { | 60 { |
| 61 unsigned oldSpan = m_span; | 61 unsigned oldSpan = m_span; |
| 62 Node* n = node(); | 62 Node* n = node(); |
| 63 if (n && (n->hasTagName(colTag) || n->hasTagName(colgroupTag))) { | 63 if (n && isHTMLTableColElement(*n)) { |
| 64 HTMLTableColElement* tc = toHTMLTableColElement(n); | 64 HTMLTableColElement& tc = toHTMLTableColElement(*n); |
| 65 m_span = tc->span(); | 65 m_span = tc.span(); |
| 66 } else | 66 } else |
| 67 m_span = !(style() && style()->display() == TABLE_COLUMN_GROUP); | 67 m_span = !(style() && style()->display() == TABLE_COLUMN_GROUP); |
| 68 if (m_span != oldSpan && style() && parent()) | 68 if (m_span != oldSpan && style() && parent()) |
| 69 setNeedsLayoutAndPrefWidthsRecalc(); | 69 setNeedsLayoutAndPrefWidthsRecalc(); |
| 70 } | 70 } |
| 71 | 71 |
| 72 void RenderTableCol::insertedIntoTree() | 72 void RenderTableCol::insertedIntoTree() |
| 73 { | 73 { |
| 74 RenderBox::insertedIntoTree(); | 74 RenderBox::insertedIntoTree(); |
| 75 table()->addColumn(this); | 75 table()->addColumn(this); |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 return style()->borderStart(); | 174 return style()->borderStart(); |
| 175 } | 175 } |
| 176 | 176 |
| 177 const BorderValue& RenderTableCol::borderAdjoiningCellAfter(const RenderTableCel
l* cell) const | 177 const BorderValue& RenderTableCol::borderAdjoiningCellAfter(const RenderTableCel
l* cell) const |
| 178 { | 178 { |
| 179 ASSERT_UNUSED(cell, table()->colElement(cell->col() - 1) == this); | 179 ASSERT_UNUSED(cell, table()->colElement(cell->col() - 1) == this); |
| 180 return style()->borderEnd(); | 180 return style()->borderEnd(); |
| 181 } | 181 } |
| 182 | 182 |
| 183 } | 183 } |
| OLD | NEW |