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

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

Issue 335963002: Change LayoutState to be stack-allocated (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix push function to match old behavior... 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 * This file is part of the render object implementation for KHTML. 2 * This file is part of the render object implementation for KHTML.
3 * 3 *
4 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 4 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
5 * (C) 1999 Antti Koivisto (koivisto@kde.org) 5 * (C) 1999 Antti Koivisto (koivisto@kde.org)
6 * Copyright (C) 2003 Apple Computer, Inc. 6 * Copyright (C) 2003 Apple Computer, Inc.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 void RenderDeprecatedFlexibleBox::layoutBlock(bool relayoutChildren) 256 void RenderDeprecatedFlexibleBox::layoutBlock(bool relayoutChildren)
257 { 257 {
258 ASSERT(needsLayout()); 258 ASSERT(needsLayout());
259 259
260 if (!relayoutChildren && simplifiedLayout()) 260 if (!relayoutChildren && simplifiedLayout())
261 return; 261 return;
262 262
263 LayoutRepainter repainter(*this, checkForPaintInvalidationDuringLayout()); 263 LayoutRepainter repainter(*this, checkForPaintInvalidationDuringLayout());
264 264
265 { 265 {
266 // LayoutStateMaintainer needs this deliberate scope to pop before repai nt 266 // LayoutState needs this deliberate scope to pop before repaint
267 LayoutStateMaintainer statePusher(*this, locationOffset()); 267 LayoutState state(*this, locationOffset());
268 268
269 LayoutSize previousSize = size(); 269 LayoutSize previousSize = size();
270 270
271 updateLogicalWidth(); 271 updateLogicalWidth();
272 updateLogicalHeight(); 272 updateLogicalHeight();
273 273
274 FastTextAutosizer::LayoutScope fastTextAutosizerLayoutScope(this); 274 FastTextAutosizer::LayoutScope fastTextAutosizerLayoutScope(this);
275 275
276 if (previousSize != size() 276 if (previousSize != size()
277 || (parent()->isDeprecatedFlexibleBox() && parent()->style()->boxOri ent() == HORIZONTAL 277 || (parent()->isDeprecatedFlexibleBox() && parent()->style()->boxOri ent() == HORIZONTAL
(...skipping 806 matching lines...) Expand 10 before | Expand all | Expand 10 after
1084 if (isPseudoElement()) 1084 if (isPseudoElement())
1085 return "RenderDeprecatedFlexibleBox (generated)"; 1085 return "RenderDeprecatedFlexibleBox (generated)";
1086 if (isAnonymous()) 1086 if (isAnonymous())
1087 return "RenderDeprecatedFlexibleBox (generated)"; 1087 return "RenderDeprecatedFlexibleBox (generated)";
1088 if (isRelPositioned()) 1088 if (isRelPositioned())
1089 return "RenderDeprecatedFlexibleBox (relative positioned)"; 1089 return "RenderDeprecatedFlexibleBox (relative positioned)";
1090 return "RenderDeprecatedFlexibleBox"; 1090 return "RenderDeprecatedFlexibleBox";
1091 } 1091 }
1092 1092
1093 } // namespace WebCore 1093 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698