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 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
338 layoutGridItems(); | 338 layoutGridItems(); |
339 | 339 |
340 LayoutUnit oldClientAfterEdge = clientLogicalBottom(); | 340 LayoutUnit oldClientAfterEdge = clientLogicalBottom(); |
341 updateLogicalHeight(); | 341 updateLogicalHeight(); |
342 | 342 |
343 if (size() != previousSize) | 343 if (size() != previousSize) |
344 relayoutChildren = true; | 344 relayoutChildren = true; |
345 | 345 |
346 layoutPositionedObjects(relayoutChildren || isDocumentElement()); | 346 layoutPositionedObjects(relayoutChildren || isDocumentElement()); |
347 | 347 |
348 computeRegionRangeForBlock(flowThreadContainingBlock()); | |
349 | |
350 computeOverflow(oldClientAfterEdge); | 348 computeOverflow(oldClientAfterEdge); |
351 | 349 |
352 updateLayerTransformAfterLayout(); | 350 updateLayerTransformAfterLayout(); |
353 | 351 |
354 // Update our scroll information if we're overflow:auto/scroll/hidden now th
at we know if | 352 // Update our scroll information if we're overflow:auto/scroll/hidden now th
at we know if |
355 // we overflow or not. | 353 // we overflow or not. |
356 if (hasOverflowClip()) | 354 if (hasOverflowClip()) |
357 layer()->scrollableArea()->updateAfterLayout(); | 355 layer()->scrollableArea()->updateAfterLayout(); |
358 | 356 |
359 clearNeedsLayout(); | 357 clearNeedsLayout(); |
(...skipping 1063 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1423 if (isOutOfFlowPositioned()) | 1421 if (isOutOfFlowPositioned()) |
1424 return "RenderGrid (positioned)"; | 1422 return "RenderGrid (positioned)"; |
1425 if (isAnonymous()) | 1423 if (isAnonymous()) |
1426 return "RenderGrid (generated)"; | 1424 return "RenderGrid (generated)"; |
1427 if (isRelPositioned()) | 1425 if (isRelPositioned()) |
1428 return "RenderGrid (relative positioned)"; | 1426 return "RenderGrid (relative positioned)"; |
1429 return "RenderGrid"; | 1427 return "RenderGrid"; |
1430 } | 1428 } |
1431 | 1429 |
1432 } // namespace blink | 1430 } // namespace blink |
OLD | NEW |