| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2011 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 261 ASSERT(needsLayout()); | 261 ASSERT(needsLayout()); |
| 262 | 262 |
| 263 if (!relayoutChildren && simplifiedLayout()) | 263 if (!relayoutChildren && simplifiedLayout()) |
| 264 return; | 264 return; |
| 265 | 265 |
| 266 // FIXME: Much of this method is boiler plate that matches RenderBox::layout
Block and Render*FlexibleBox::layoutBlock. | 266 // FIXME: Much of this method is boiler plate that matches RenderBox::layout
Block and Render*FlexibleBox::layoutBlock. |
| 267 // It would be nice to refactor some of the duplicate code. | 267 // It would be nice to refactor some of the duplicate code. |
| 268 LayoutRepainter repainter(*this, checkForRepaintDuringLayout()); | 268 LayoutRepainter repainter(*this, checkForRepaintDuringLayout()); |
| 269 LayoutStateMaintainer statePusher(*this, locationOffset()); | 269 LayoutStateMaintainer statePusher(*this, locationOffset()); |
| 270 | 270 |
| 271 RenderFlowThread* flowThread = flowThreadContainingBlock(); | |
| 272 if (updateRegionsAndShapesLogicalSize(flowThread)) | |
| 273 relayoutChildren = true; | |
| 274 | |
| 275 LayoutSize previousSize = size(); | 271 LayoutSize previousSize = size(); |
| 276 | 272 |
| 277 setLogicalHeight(0); | 273 setLogicalHeight(0); |
| 278 updateLogicalWidth(); | 274 updateLogicalWidth(); |
| 279 | 275 |
| 280 layoutGridItems(); | 276 layoutGridItems(); |
| 281 | 277 |
| 282 LayoutUnit oldClientAfterEdge = clientLogicalBottom(); | 278 LayoutUnit oldClientAfterEdge = clientLogicalBottom(); |
| 283 updateLogicalHeight(); | 279 updateLogicalHeight(); |
| 284 | 280 |
| 285 if (size() != previousSize) | 281 if (size() != previousSize) |
| 286 relayoutChildren = true; | 282 relayoutChildren = true; |
| 287 | 283 |
| 288 layoutPositionedObjects(relayoutChildren || isRoot()); | 284 layoutPositionedObjects(relayoutChildren || isRoot()); |
| 289 | 285 |
| 290 computeRegionRangeForBlock(flowThread); | 286 computeRegionRangeForBlock(flowThreadContainingBlock()); |
| 291 | 287 |
| 292 computeOverflow(oldClientAfterEdge); | 288 computeOverflow(oldClientAfterEdge); |
| 293 | 289 |
| 294 updateLayerTransform(); | 290 updateLayerTransform(); |
| 295 | 291 |
| 296 // Update our scroll information if we're overflow:auto/scroll/hidden now th
at we know if | 292 // Update our scroll information if we're overflow:auto/scroll/hidden now th
at we know if |
| 297 // we overflow or not. | 293 // we overflow or not. |
| 298 if (hasOverflowClip()) | 294 if (hasOverflowClip()) |
| 299 layer()->scrollableArea()->updateAfterLayout(); | 295 layer()->scrollableArea()->updateAfterLayout(); |
| 300 | 296 |
| (...skipping 1090 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1391 if (isOutOfFlowPositioned()) | 1387 if (isOutOfFlowPositioned()) |
| 1392 return "RenderGrid (positioned)"; | 1388 return "RenderGrid (positioned)"; |
| 1393 if (isAnonymous()) | 1389 if (isAnonymous()) |
| 1394 return "RenderGrid (generated)"; | 1390 return "RenderGrid (generated)"; |
| 1395 if (isRelPositioned()) | 1391 if (isRelPositioned()) |
| 1396 return "RenderGrid (relative positioned)"; | 1392 return "RenderGrid (relative positioned)"; |
| 1397 return "RenderGrid"; | 1393 return "RenderGrid"; |
| 1398 } | 1394 } |
| 1399 | 1395 |
| 1400 } // namespace WebCore | 1396 } // namespace WebCore |
| OLD | NEW |