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

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

Issue 335963002: Change LayoutState to be stack-allocated (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix assert Created 6 years, 6 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 | Annotate | Revision Log
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 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 void RenderGrid::layoutBlock(bool relayoutChildren) 291 void RenderGrid::layoutBlock(bool relayoutChildren)
292 { 292 {
293 ASSERT(needsLayout()); 293 ASSERT(needsLayout());
294 294
295 if (!relayoutChildren && simplifiedLayout()) 295 if (!relayoutChildren && simplifiedLayout())
296 return; 296 return;
297 297
298 // FIXME: Much of this method is boiler plate that matches RenderBox::layout Block and Render*FlexibleBox::layoutBlock. 298 // FIXME: Much of this method is boiler plate that matches RenderBox::layout Block and Render*FlexibleBox::layoutBlock.
299 // It would be nice to refactor some of the duplicate code. 299 // It would be nice to refactor some of the duplicate code.
300 LayoutRepainter repainter(*this, checkForPaintInvalidationDuringLayout()); 300 LayoutRepainter repainter(*this, checkForPaintInvalidationDuringLayout());
301 LayoutStateMaintainer statePusher(*this, locationOffset()); 301 LayoutState statePusher(*this, locationOffset());
302 302
303 LayoutSize previousSize = size(); 303 LayoutSize previousSize = size();
304 304
305 setLogicalHeight(0); 305 setLogicalHeight(0);
306 updateLogicalWidth(); 306 updateLogicalWidth();
307 307
308 FastTextAutosizer::LayoutScope fastTextAutosizerLayoutScope(this); 308 FastTextAutosizer::LayoutScope fastTextAutosizerLayoutScope(this);
309 309
310 layoutGridItems(); 310 layoutGridItems();
311 311
(...skipping 950 matching lines...) Expand 10 before | Expand all | Expand 10 after
1262 if (isOutOfFlowPositioned()) 1262 if (isOutOfFlowPositioned())
1263 return "RenderGrid (positioned)"; 1263 return "RenderGrid (positioned)";
1264 if (isAnonymous()) 1264 if (isAnonymous())
1265 return "RenderGrid (generated)"; 1265 return "RenderGrid (generated)";
1266 if (isRelPositioned()) 1266 if (isRelPositioned())
1267 return "RenderGrid (relative positioned)"; 1267 return "RenderGrid (relative positioned)";
1268 return "RenderGrid"; 1268 return "RenderGrid";
1269 } 1269 }
1270 1270
1271 } // namespace WebCore 1271 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698