| 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 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 ASSERT(needsLayout()); | 254 ASSERT(needsLayout()); |
| 255 | 255 |
| 256 if (!relayoutChildren && simplifiedLayout()) | 256 if (!relayoutChildren && simplifiedLayout()) |
| 257 return; | 257 return; |
| 258 | 258 |
| 259 // FIXME: Much of this method is boiler plate that matches RenderBox::layout
Block and Render*FlexibleBox::layoutBlock. | 259 // FIXME: Much of this method is boiler plate that matches RenderBox::layout
Block and Render*FlexibleBox::layoutBlock. |
| 260 // It would be nice to refactor some of the duplicate code. | 260 // It would be nice to refactor some of the duplicate code. |
| 261 LayoutRepainter repainter(*this, checkForRepaintDuringLayout()); | 261 LayoutRepainter repainter(*this, checkForRepaintDuringLayout()); |
| 262 LayoutStateMaintainer statePusher(view(), this, locationOffset(), hasTransfo
rm() || hasReflection() || style()->isFlippedBlocksWritingMode()); | 262 LayoutStateMaintainer statePusher(view(), this, locationOffset(), hasTransfo
rm() || hasReflection() || style()->isFlippedBlocksWritingMode()); |
| 263 | 263 |
| 264 // Regions changing widths can force us to relayout our children. | |
| 265 RenderFlowThread* flowThread = flowThreadContainingBlock(); | 264 RenderFlowThread* flowThread = flowThreadContainingBlock(); |
| 266 if (logicalWidthChangedInRegions(flowThread)) | |
| 267 relayoutChildren = true; | |
| 268 if (updateRegionsAndShapesLogicalSize(flowThread)) | 265 if (updateRegionsAndShapesLogicalSize(flowThread)) |
| 269 relayoutChildren = true; | 266 relayoutChildren = true; |
| 270 | 267 |
| 271 LayoutSize previousSize = size(); | 268 LayoutSize previousSize = size(); |
| 272 | 269 |
| 273 setLogicalHeight(0); | 270 setLogicalHeight(0); |
| 274 updateLogicalWidth(); | 271 updateLogicalWidth(); |
| 275 | 272 |
| 276 layoutGridItems(); | 273 layoutGridItems(); |
| 277 | 274 |
| (...skipping 1042 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1320 if (isOutOfFlowPositioned()) | 1317 if (isOutOfFlowPositioned()) |
| 1321 return "RenderGrid (positioned)"; | 1318 return "RenderGrid (positioned)"; |
| 1322 if (isAnonymous()) | 1319 if (isAnonymous()) |
| 1323 return "RenderGrid (generated)"; | 1320 return "RenderGrid (generated)"; |
| 1324 if (isRelPositioned()) | 1321 if (isRelPositioned()) |
| 1325 return "RenderGrid (relative positioned)"; | 1322 return "RenderGrid (relative positioned)"; |
| 1326 return "RenderGrid"; | 1323 return "RenderGrid"; |
| 1327 } | 1324 } |
| 1328 | 1325 |
| 1329 } // namespace WebCore | 1326 } // namespace WebCore |
| OLD | NEW |