Chromium Code Reviews| 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->logicalWidth() != style()->logicalWidth ()) { | |
| 57 unsigned nEffCols = table->numEffCols(); | |
| 58 unsigned currentColumn = 0; | |
| 59 for (RenderTableCol* column = table->firstColumn()->nextColumn(); co lumn; column = column->nextColumn()) { | |
|
Julien - ping for review
2014/02/14 18:18:37
The logic skips the first column, is that intentio
Gurpreet
2014/02/17 09:32:08
The firstColumn would give the colgroup instead of
| |
| 60 if (this == column) | |
| 61 break; | |
| 62 currentColumn += column->span(); | |
| 63 } | |
| 64 unsigned currentColSpan = currentColumn + span(); | |
| 65 for (unsigned j = currentColumn; j < currentColSpan && currentColSpa n <= nEffCols; j++) { | |
| 66 for (unsigned i = 0; i < table->firstBody()->numRows(); i++) { | |
|
Julien - ping for review
2014/02/14 18:18:37
You can't limit yourself to the first table-body a
Gurpreet
2014/02/17 09:32:08
Done.
| |
| 67 RenderTableCell* cell = table->firstBody()->primaryCellAt(i, j); | |
| 68 if (!cell) | |
| 69 continue; | |
| 70 cell->setPreferredLogicalWidthsDirty(); | |
| 71 } | |
| 72 } | |
| 73 } | |
| 56 } | 74 } |
| 57 } | 75 } |
| 58 | 76 |
| 59 void RenderTableCol::updateFromElement() | 77 void RenderTableCol::updateFromElement() |
| 60 { | 78 { |
| 61 unsigned oldSpan = m_span; | 79 unsigned oldSpan = m_span; |
| 62 Node* n = node(); | 80 Node* n = node(); |
| 63 if (n && (n->hasTagName(colTag) || n->hasTagName(colgroupTag))) { | 81 if (n && (n->hasTagName(colTag) || n->hasTagName(colgroupTag))) { |
| 64 HTMLTableColElement* tc = toHTMLTableColElement(n); | 82 HTMLTableColElement* tc = toHTMLTableColElement(n); |
| 65 m_span = tc->span(); | 83 m_span = tc->span(); |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 174 return style()->borderStart(); | 192 return style()->borderStart(); |
| 175 } | 193 } |
| 176 | 194 |
| 177 const BorderValue& RenderTableCol::borderAdjoiningCellAfter(const RenderTableCel l* cell) const | 195 const BorderValue& RenderTableCol::borderAdjoiningCellAfter(const RenderTableCel l* cell) const |
| 178 { | 196 { |
| 179 ASSERT_UNUSED(cell, table()->colElement(cell->col() - 1) == this); | 197 ASSERT_UNUSED(cell, table()->colElement(cell->col() - 1) == this); |
| 180 return style()->borderEnd(); | 198 return style()->borderEnd(); |
| 181 } | 199 } |
| 182 | 200 |
| 183 } | 201 } |
| OLD | NEW |