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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 71 } | 71 } |
| 72 | 72 |
| 73 void LayoutTableCol::updateFromElement() | 73 void LayoutTableCol::updateFromElement() |
| 74 { | 74 { |
| 75 unsigned oldSpan = m_span; | 75 unsigned oldSpan = m_span; |
| 76 Node* n = node(); | 76 Node* n = node(); |
| 77 if (isHTMLTableColElement(n)) { | 77 if (isHTMLTableColElement(n)) { |
| 78 HTMLTableColElement& tc = toHTMLTableColElement(*n); | 78 HTMLTableColElement& tc = toHTMLTableColElement(*n); |
| 79 m_span = tc.span(); | 79 m_span = tc.span(); |
| 80 } else { | 80 } else { |
| 81 m_span = !(style() && style()->display() == TABLE_COLUMN_GROUP); | 81 m_span = 1; |
|
leviw_travelin_and_unemployed
2015/05/29 17:07:12
This was just weird to begin with!
| |
| 82 } | 82 } |
| 83 if (m_span != oldSpan && style() && parent()) | 83 if (m_span != oldSpan && style() && parent()) |
| 84 setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(LayoutInvalida tionReason::AttributeChanged); | 84 setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(LayoutInvalida tionReason::AttributeChanged); |
| 85 } | 85 } |
| 86 | 86 |
| 87 void LayoutTableCol::insertedIntoTree() | 87 void LayoutTableCol::insertedIntoTree() |
| 88 { | 88 { |
| 89 LayoutBox::insertedIntoTree(); | 89 LayoutBox::insertedIntoTree(); |
| 90 table()->addColumn(this); | 90 table()->addColumn(this); |
| 91 } | 91 } |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 189 return style()->borderStart(); | 189 return style()->borderStart(); |
| 190 } | 190 } |
| 191 | 191 |
| 192 const BorderValue& LayoutTableCol::borderAdjoiningCellAfter(const LayoutTableCel l* cell) const | 192 const BorderValue& LayoutTableCol::borderAdjoiningCellAfter(const LayoutTableCel l* cell) const |
| 193 { | 193 { |
| 194 ASSERT_UNUSED(cell, table()->colElement(cell->col() - 1) == this); | 194 ASSERT_UNUSED(cell, table()->colElement(cell->col() - 1) == this); |
| 195 return style()->borderEnd(); | 195 return style()->borderEnd(); |
| 196 } | 196 } |
| 197 | 197 |
| 198 } | 198 } |
| OLD | NEW |