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 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
208 if (index != notFound) { | 208 if (index != notFound) { |
209 m_captions.remove(index); | 209 m_captions.remove(index); |
210 if (node()) | 210 if (node()) |
211 node()->setNeedsStyleRecalc(); | 211 node()->setNeedsStyleRecalc(); |
212 } | 212 } |
213 setNeedsSectionRecalc(); | 213 setNeedsSectionRecalc(); |
214 } | 214 } |
215 | 215 |
216 void RenderTable::computeLogicalWidth() | 216 void RenderTable::computeLogicalWidth() |
217 { | 217 { |
| 218 recalcSectionsIfNeeded(); |
| 219 |
218 if (isPositioned()) | 220 if (isPositioned()) |
219 computePositionedLogicalWidth(); | 221 computePositionedLogicalWidth(); |
220 | 222 |
221 RenderBlock* cb = containingBlock(); | 223 RenderBlock* cb = containingBlock(); |
222 | 224 |
223 LayoutUnit availableLogicalWidth = containingBlockLogicalWidthForContent(); | 225 LayoutUnit availableLogicalWidth = containingBlockLogicalWidthForContent(); |
224 bool hasPerpendicularContainingBlock = cb->style()->isHorizontalWritingMode(
) != style()->isHorizontalWritingMode(); | 226 bool hasPerpendicularContainingBlock = cb->style()->isHorizontalWritingMode(
) != style()->isHorizontalWritingMode(); |
225 LayoutUnit containerWidthInInlineDirection = hasPerpendicularContainingBlock
? perpendicularContainingBlockLogicalHeight() : availableLogicalWidth; | 227 LayoutUnit containerWidthInInlineDirection = hasPerpendicularContainingBlock
? perpendicularContainingBlockLogicalHeight() : availableLogicalWidth; |
226 | 228 |
227 LengthType logicalWidthType = style()->logicalWidth().type(); | 229 LengthType logicalWidthType = style()->logicalWidth().type(); |
(...skipping 996 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1224 if (visibleToHitTesting() && (action == HitTestBlockBackground || action ==
HitTestChildBlockBackground) && boundsRect.intersects(result.rectForPoint(pointI
nContainer))) { | 1226 if (visibleToHitTesting() && (action == HitTestBlockBackground || action ==
HitTestChildBlockBackground) && boundsRect.intersects(result.rectForPoint(pointI
nContainer))) { |
1225 updateHitTestResult(result, flipForWritingMode(pointInContainer - toLayo
utSize(adjustedLocation))); | 1227 updateHitTestResult(result, flipForWritingMode(pointInContainer - toLayo
utSize(adjustedLocation))); |
1226 if (!result.addNodeToRectBasedTestResult(node(), pointInContainer, bound
sRect)) | 1228 if (!result.addNodeToRectBasedTestResult(node(), pointInContainer, bound
sRect)) |
1227 return true; | 1229 return true; |
1228 } | 1230 } |
1229 | 1231 |
1230 return false; | 1232 return false; |
1231 } | 1233 } |
1232 | 1234 |
1233 } | 1235 } |
OLD | NEW |