Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(570)

Side by Side Diff: Source/core/rendering/RenderGrid.cpp

Issue 162613007: Reduce the number of parameters to LayoutStateMaintainer by one (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/rendering/RenderFlexibleBox.cpp ('k') | Source/core/rendering/RenderMedia.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 void RenderGrid::layoutBlock(bool relayoutChildren) 251 void RenderGrid::layoutBlock(bool relayoutChildren)
252 { 252 {
253 ASSERT(needsLayout()); 253 ASSERT(needsLayout());
254 254
255 if (!relayoutChildren && simplifiedLayout()) 255 if (!relayoutChildren && simplifiedLayout())
256 return; 256 return;
257 257
258 // FIXME: Much of this method is boiler plate that matches RenderBox::layout Block and Render*FlexibleBox::layoutBlock. 258 // FIXME: Much of this method is boiler plate that matches RenderBox::layout Block and Render*FlexibleBox::layoutBlock.
259 // It would be nice to refactor some of the duplicate code. 259 // It would be nice to refactor some of the duplicate code.
260 LayoutRepainter repainter(*this, checkForRepaintDuringLayout()); 260 LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
261 LayoutStateMaintainer statePusher(view(), this, locationOffset(), hasTransfo rm() || hasReflection() || style()->isFlippedBlocksWritingMode()); 261 LayoutStateMaintainer statePusher(this, locationOffset(), hasTransform() || hasReflection() || style()->isFlippedBlocksWritingMode());
262 262
263 RenderFlowThread* flowThread = flowThreadContainingBlock(); 263 RenderFlowThread* flowThread = flowThreadContainingBlock();
264 if (updateRegionsAndShapesLogicalSize(flowThread)) 264 if (updateRegionsAndShapesLogicalSize(flowThread))
265 relayoutChildren = true; 265 relayoutChildren = true;
266 266
267 LayoutSize previousSize = size(); 267 LayoutSize previousSize = size();
268 268
269 setLogicalHeight(0); 269 setLogicalHeight(0);
270 updateLogicalWidth(); 270 updateLogicalWidth();
271 271
(...skipping 1102 matching lines...) Expand 10 before | Expand all | Expand 10 after
1374 if (isOutOfFlowPositioned()) 1374 if (isOutOfFlowPositioned())
1375 return "RenderGrid (positioned)"; 1375 return "RenderGrid (positioned)";
1376 if (isAnonymous()) 1376 if (isAnonymous())
1377 return "RenderGrid (generated)"; 1377 return "RenderGrid (generated)";
1378 if (isRelPositioned()) 1378 if (isRelPositioned())
1379 return "RenderGrid (relative positioned)"; 1379 return "RenderGrid (relative positioned)";
1380 return "RenderGrid"; 1380 return "RenderGrid";
1381 } 1381 }
1382 1382
1383 } // namespace WebCore 1383 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderFlexibleBox.cpp ('k') | Source/core/rendering/RenderMedia.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698