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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
44 updateFromElement(); | 44 updateFromElement(); |
45 } | 45 } |
46 | 46 |
47 void RenderTableCol::styleDidChange(StyleDifference diff, const RenderStyle* old Style) | 47 void RenderTableCol::styleDidChange(StyleDifference diff, const RenderStyle* old Style) |
48 { | 48 { |
49 RenderBox::styleDidChange(diff, oldStyle); | 49 RenderBox::styleDidChange(diff, oldStyle); |
50 | 50 |
51 // If border was changed, notify table. | 51 // If border was changed, notify table. |
52 if (parent()) { | 52 if (parent()) { |
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 } else if (oldStyle && oldStyle->width() != style()->width()) { | |
Julien - ping for review
2014/02/06 22:28:18
I don't think this is right: you need to check log
| |
57 for (RenderObject* child = table->children()->firstChild(); child; c hild = child->nextSibling()) { | |
58 if (child->isTableSection()) { | |
Julien - ping for review
2014/02/06 22:28:18
We prefer early return so I would expect us to pre
| |
59 RenderTableSection* section = toRenderTableSection(child); | |
60 unsigned nEffCols = table->numEffCols(); | |
61 for (unsigned j = 0; j < nEffCols; j++) { | |
62 for (unsigned i = 0; i < section->numRows(); i++) { | |
63 RenderTableCell* cell = section->primaryCellAt(i, j) ; | |
64 if (!cell) | |
65 continue; | |
66 cell->setPreferredLogicalWidthsDirty(); | |
67 } | |
68 } | |
69 } | |
Julien - ping for review
2014/02/06 22:28:18
You are basically dirtying the preferred logical w
| |
70 } | |
71 } | |
56 } | 72 } |
57 } | 73 } |
58 | 74 |
59 void RenderTableCol::updateFromElement() | 75 void RenderTableCol::updateFromElement() |
60 { | 76 { |
61 unsigned oldSpan = m_span; | 77 unsigned oldSpan = m_span; |
62 Node* n = node(); | 78 Node* n = node(); |
63 if (n && (n->hasTagName(colTag) || n->hasTagName(colgroupTag))) { | 79 if (n && (n->hasTagName(colTag) || n->hasTagName(colgroupTag))) { |
64 HTMLTableColElement* tc = toHTMLTableColElement(n); | 80 HTMLTableColElement* tc = toHTMLTableColElement(n); |
65 m_span = tc->span(); | 81 m_span = tc->span(); |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
174 return style()->borderStart(); | 190 return style()->borderStart(); |
175 } | 191 } |
176 | 192 |
177 const BorderValue& RenderTableCol::borderAdjoiningCellAfter(const RenderTableCel l* cell) const | 193 const BorderValue& RenderTableCol::borderAdjoiningCellAfter(const RenderTableCel l* cell) const |
178 { | 194 { |
179 ASSERT_UNUSED(cell, table()->colElement(cell->col() - 1) == this); | 195 ASSERT_UNUSED(cell, table()->colElement(cell->col() - 1) == this); |
180 return style()->borderEnd(); | 196 return style()->borderEnd(); |
181 } | 197 } |
182 | 198 |
183 } | 199 } |
OLD | NEW |