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, 2007, 2008, 2009, 2010, 2013 Apple Inc.
All rights reserved. | 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc.
All rights reserved. |
8 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
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 899 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
910 | 910 |
911 int LayoutTable::calcBorderStart() const | 911 int LayoutTable::calcBorderStart() const |
912 { | 912 { |
913 if (!collapseBorders()) | 913 if (!collapseBorders()) |
914 return LayoutBlock::borderStart(); | 914 return LayoutBlock::borderStart(); |
915 | 915 |
916 // Determined by the first cell of the first row. See the CSS 2.1 spec, sect
ion 17.6.2. | 916 // Determined by the first cell of the first row. See the CSS 2.1 spec, sect
ion 17.6.2. |
917 if (!numEffCols()) | 917 if (!numEffCols()) |
918 return 0; | 918 return 0; |
919 | 919 |
920 unsigned borderWidth = 0; | 920 int borderWidth = 0; |
921 | 921 |
922 const BorderValue& tableStartBorder = style()->borderStart(); | 922 const BorderValue& tableStartBorder = style()->borderStart(); |
923 if (tableStartBorder.style() == BHIDDEN) | 923 if (tableStartBorder.style() == BHIDDEN) |
924 return 0; | 924 return 0; |
925 if (tableStartBorder.style() > BHIDDEN) | 925 if (tableStartBorder.style() > BHIDDEN) |
926 borderWidth = tableStartBorder.width(); | 926 borderWidth = tableStartBorder.width(); |
927 | 927 |
928 if (LayoutTableCol* column = colElement(0)) { | 928 if (LayoutTableCol* column = colElement(0)) { |
929 // FIXME: We don't account for direction on columns and column groups. | 929 // FIXME: We don't account for direction on columns and column groups. |
930 const BorderValue& columnAdjoiningBorder = column->style()->borderStart(
); | 930 const BorderValue& columnAdjoiningBorder = column->style()->borderStart(
); |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
964 | 964 |
965 int LayoutTable::calcBorderEnd() const | 965 int LayoutTable::calcBorderEnd() const |
966 { | 966 { |
967 if (!collapseBorders()) | 967 if (!collapseBorders()) |
968 return LayoutBlock::borderEnd(); | 968 return LayoutBlock::borderEnd(); |
969 | 969 |
970 // Determined by the last cell of the first row. See the CSS 2.1 spec, secti
on 17.6.2. | 970 // Determined by the last cell of the first row. See the CSS 2.1 spec, secti
on 17.6.2. |
971 if (!numEffCols()) | 971 if (!numEffCols()) |
972 return 0; | 972 return 0; |
973 | 973 |
974 unsigned borderWidth = 0; | 974 int borderWidth = 0; |
975 | 975 |
976 const BorderValue& tableEndBorder = style()->borderEnd(); | 976 const BorderValue& tableEndBorder = style()->borderEnd(); |
977 if (tableEndBorder.style() == BHIDDEN) | 977 if (tableEndBorder.style() == BHIDDEN) |
978 return 0; | 978 return 0; |
979 if (tableEndBorder.style() > BHIDDEN) | 979 if (tableEndBorder.style() > BHIDDEN) |
980 borderWidth = tableEndBorder.width(); | 980 borderWidth = tableEndBorder.width(); |
981 | 981 |
982 unsigned endColumn = numEffCols() - 1; | 982 unsigned endColumn = numEffCols() - 1; |
983 if (LayoutTableCol* column = colElement(endColumn)) { | 983 if (LayoutTableCol* column = colElement(endColumn)) { |
984 // FIXME: We don't account for direction on columns and column groups. | 984 // FIXME: We don't account for direction on columns and column groups. |
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1416 cell->invalidateDisplayItemClient(*cell); | 1416 cell->invalidateDisplayItemClient(*cell); |
1417 } | 1417 } |
1418 } | 1418 } |
1419 } | 1419 } |
1420 } | 1420 } |
1421 | 1421 |
1422 LayoutBlock::invalidatePaintOfSubtreesIfNeeded(childPaintInvalidationState); | 1422 LayoutBlock::invalidatePaintOfSubtreesIfNeeded(childPaintInvalidationState); |
1423 } | 1423 } |
1424 | 1424 |
1425 } | 1425 } |
OLD | NEW |