| 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 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 updateLogicalHeight(); | 275 updateLogicalHeight(); |
| 276 | 276 |
| 277 if (size() != previousSize) | 277 if (size() != previousSize) |
| 278 relayoutChildren = true; | 278 relayoutChildren = true; |
| 279 | 279 |
| 280 layoutPositionedObjects(relayoutChildren || isRoot()); | 280 layoutPositionedObjects(relayoutChildren || isRoot()); |
| 281 | 281 |
| 282 computeRegionRangeForBlock(flowThread); | 282 computeRegionRangeForBlock(flowThread); |
| 283 | 283 |
| 284 computeOverflow(oldClientAfterEdge); | 284 computeOverflow(oldClientAfterEdge); |
| 285 statePusher.pop(); | |
| 286 | 285 |
| 287 updateLayerTransform(); | 286 updateLayerTransform(); |
| 288 | 287 |
| 289 // Update our scroll information if we're overflow:auto/scroll/hidden now th
at we know if | 288 // Update our scroll information if we're overflow:auto/scroll/hidden now th
at we know if |
| 290 // we overflow or not. | 289 // we overflow or not. |
| 291 if (hasOverflowClip()) | 290 if (hasOverflowClip()) |
| 292 layer()->scrollableArea()->updateAfterLayout(); | 291 layer()->scrollableArea()->updateAfterLayout(); |
| 293 | 292 |
| 294 repainter.repaintAfterLayout(); | 293 repainter.repaintAfterLayout(); |
| 295 | 294 |
| (...skipping 1086 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1382 if (isOutOfFlowPositioned()) | 1381 if (isOutOfFlowPositioned()) |
| 1383 return "RenderGrid (positioned)"; | 1382 return "RenderGrid (positioned)"; |
| 1384 if (isAnonymous()) | 1383 if (isAnonymous()) |
| 1385 return "RenderGrid (generated)"; | 1384 return "RenderGrid (generated)"; |
| 1386 if (isRelPositioned()) | 1385 if (isRelPositioned()) |
| 1387 return "RenderGrid (relative positioned)"; | 1386 return "RenderGrid (relative positioned)"; |
| 1388 return "RenderGrid"; | 1387 return "RenderGrid"; |
| 1389 } | 1388 } |
| 1390 | 1389 |
| 1391 } // namespace WebCore | 1390 } // namespace WebCore |
| OLD | NEW |