OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |
3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ight reserved. | 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ight reserved. |
4 * Copyright (C) 2010 Google Inc. All rights reserved. | 4 * Copyright (C) 2010 Google Inc. All rights reserved. |
5 * | 5 * |
6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
10 * | 10 * |
(...skipping 1190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1201 o->containingBlock()->insertPositionedObject(box); | 1201 o->containingBlock()->insertPositionedObject(box); |
1202 else if (o->isFloating()) | 1202 else if (o->isFloating()) |
1203 floats.append(FloatWithRect(box)); | 1203 floats.append(FloatWithRect(box)); |
1204 else if (layoutState.isFullLayout() || o->needsLayout()) { | 1204 else if (layoutState.isFullLayout() || o->needsLayout()) { |
1205 // Replaced elements | 1205 // Replaced elements |
1206 toRenderBox(o)->dirtyLineBoxes(layoutState.isFullLayout()); | 1206 toRenderBox(o)->dirtyLineBoxes(layoutState.isFullLayout()); |
1207 o->layoutIfNeeded(); | 1207 o->layoutIfNeeded(); |
1208 } | 1208 } |
1209 } else if (o->isText() || (o->isRenderInline() && !walker.atEndOfInl
ine())) { | 1209 } else if (o->isText() || (o->isRenderInline() && !walker.atEndOfInl
ine())) { |
1210 if (!o->isText()) | 1210 if (!o->isText()) |
1211 toRenderInline(o)->updateAlwaysCreateLineBoxes(); | 1211 toRenderInline(o)->updateAlwaysCreateLineBoxes(layoutState.i
sFullLayout()); |
1212 if (layoutState.isFullLayout() || o->selfNeedsLayout()) | 1212 if (layoutState.isFullLayout() || o->selfNeedsLayout()) |
1213 dirtyLineBoxesForRenderer(o, layoutState.isFullLayout()); | 1213 dirtyLineBoxesForRenderer(o, layoutState.isFullLayout()); |
1214 o->setNeedsLayout(false); | 1214 o->setNeedsLayout(false); |
1215 } | 1215 } |
1216 } | 1216 } |
1217 | 1217 |
1218 layoutRunsAndFloats(layoutState, hasInlineChild, floats); | 1218 layoutRunsAndFloats(layoutState, hasInlineChild, floats); |
1219 } | 1219 } |
1220 | 1220 |
1221 // Expand the last line to accommodate Ruby and emphasis marks. | 1221 // Expand the last line to accommodate Ruby and emphasis marks. |
(...skipping 1307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2529 } | 2529 } |
2530 } | 2530 } |
2531 | 2531 |
2532 setLogicalHeight(logicalHeight() + paginationStrut); | 2532 setLogicalHeight(logicalHeight() + paginationStrut); |
2533 width.updateAvailableWidth(); | 2533 width.updateAvailableWidth(); |
2534 | 2534 |
2535 return true; | 2535 return true; |
2536 } | 2536 } |
2537 | 2537 |
2538 } | 2538 } |
OLD | NEW |