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 Apple Inc. All r
ights reserved. | 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r
ights 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 908 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
919 } | 919 } |
920 | 920 |
921 void RenderTable::recalcBordersInRowDirection() | 921 void RenderTable::recalcBordersInRowDirection() |
922 { | 922 { |
923 m_borderStart = calcBorderStart(); | 923 m_borderStart = calcBorderStart(); |
924 m_borderEnd = calcBorderEnd(); | 924 m_borderEnd = calcBorderEnd(); |
925 } | 925 } |
926 | 926 |
927 LayoutUnit RenderTable::borderBefore() const | 927 LayoutUnit RenderTable::borderBefore() const |
928 { | 928 { |
929 if (collapseBorders()) | 929 if (collapseBorders()) { |
| 930 recalcSectionsIfNeeded(); |
930 return outerBorderBefore(); | 931 return outerBorderBefore(); |
| 932 } |
931 return RenderBlock::borderBefore(); | 933 return RenderBlock::borderBefore(); |
932 } | 934 } |
933 | 935 |
934 LayoutUnit RenderTable::borderAfter() const | 936 LayoutUnit RenderTable::borderAfter() const |
935 { | 937 { |
936 if (collapseBorders()) | 938 if (collapseBorders()) { |
| 939 recalcSectionsIfNeeded(); |
937 return outerBorderAfter(); | 940 return outerBorderAfter(); |
| 941 } |
938 return RenderBlock::borderAfter(); | 942 return RenderBlock::borderAfter(); |
939 } | 943 } |
940 | 944 |
941 LayoutUnit RenderTable::outerBorderBefore() const | 945 LayoutUnit RenderTable::outerBorderBefore() const |
942 { | 946 { |
943 if (!collapseBorders()) | 947 if (!collapseBorders()) |
944 return 0; | 948 return 0; |
945 LayoutUnit borderWidth = 0; | 949 LayoutUnit borderWidth = 0; |
946 if (RenderTableSection* topSection = this->topSection()) { | 950 if (RenderTableSection* topSection = this->topSection()) { |
947 borderWidth = topSection->outerBorderBefore(); | 951 borderWidth = topSection->outerBorderBefore(); |
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1224 if (visibleToHitTesting() && (action == HitTestBlockBackground || action ==
HitTestChildBlockBackground) && boundsRect.intersects(result.rectForPoint(pointI
nContainer))) { | 1228 if (visibleToHitTesting() && (action == HitTestBlockBackground || action ==
HitTestChildBlockBackground) && boundsRect.intersects(result.rectForPoint(pointI
nContainer))) { |
1225 updateHitTestResult(result, flipForWritingMode(pointInContainer - toLayo
utSize(adjustedLocation))); | 1229 updateHitTestResult(result, flipForWritingMode(pointInContainer - toLayo
utSize(adjustedLocation))); |
1226 if (!result.addNodeToRectBasedTestResult(node(), pointInContainer, bound
sRect)) | 1230 if (!result.addNodeToRectBasedTestResult(node(), pointInContainer, bound
sRect)) |
1227 return true; | 1231 return true; |
1228 } | 1232 } |
1229 | 1233 |
1230 return false; | 1234 return false; |
1231 } | 1235 } |
1232 | 1236 |
1233 } | 1237 } |
OLD | NEW |