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

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

Issue 135043007: Remove default parameter from virtual layoutBlock function (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 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
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 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 m_minPreferredLogicalWidth = min(m_minPreferredLogicalWidth, adjustConte ntBoxLogicalWidthForBoxSizing(style()->maxWidth().value())); 243 m_minPreferredLogicalWidth = min(m_minPreferredLogicalWidth, adjustConte ntBoxLogicalWidthForBoxSizing(style()->maxWidth().value()));
244 } 244 }
245 245
246 LayoutUnit borderAndPadding = borderAndPaddingLogicalWidth(); 246 LayoutUnit borderAndPadding = borderAndPaddingLogicalWidth();
247 m_minPreferredLogicalWidth += borderAndPadding; 247 m_minPreferredLogicalWidth += borderAndPadding;
248 m_maxPreferredLogicalWidth += borderAndPadding; 248 m_maxPreferredLogicalWidth += borderAndPadding;
249 249
250 clearPreferredLogicalWidthsDirty(); 250 clearPreferredLogicalWidthsDirty();
251 } 251 }
252 252
253 void RenderDeprecatedFlexibleBox::layoutBlock(bool relayoutChildren, LayoutUnit) 253 void RenderDeprecatedFlexibleBox::layoutBlock(bool relayoutChildren)
254 { 254 {
255 ASSERT(needsLayout()); 255 ASSERT(needsLayout());
256 256
257 if (!relayoutChildren && simplifiedLayout()) 257 if (!relayoutChildren && simplifiedLayout())
258 return; 258 return;
259 259
260 LayoutRepainter repainter(*this, checkForRepaintDuringLayout()); 260 LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
261 LayoutStateMaintainer statePusher(view(), this, locationOffset(), hasTransfo rm() || hasReflection() || style()->isFlippedBlocksWritingMode()); 261 LayoutStateMaintainer statePusher(view(), this, locationOffset(), hasTransfo rm() || hasReflection() || style()->isFlippedBlocksWritingMode());
262 262
263 // Regions changing widths can force us to relayout our children. 263 // Regions changing widths can force us to relayout our children.
(...skipping 817 matching lines...) Expand 10 before | Expand all | Expand 10 after
1081 if (isPseudoElement()) 1081 if (isPseudoElement())
1082 return "RenderDeprecatedFlexibleBox (generated)"; 1082 return "RenderDeprecatedFlexibleBox (generated)";
1083 if (isAnonymous()) 1083 if (isAnonymous())
1084 return "RenderDeprecatedFlexibleBox (generated)"; 1084 return "RenderDeprecatedFlexibleBox (generated)";
1085 if (isRelPositioned()) 1085 if (isRelPositioned())
1086 return "RenderDeprecatedFlexibleBox (relative positioned)"; 1086 return "RenderDeprecatedFlexibleBox (relative positioned)";
1087 return "RenderDeprecatedFlexibleBox"; 1087 return "RenderDeprecatedFlexibleBox";
1088 } 1088 }
1089 1089
1090 } // namespace WebCore 1090 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderDeprecatedFlexibleBox.h ('k') | Source/core/rendering/RenderFlexibleBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698