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

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

Issue 535913002: Add scrollbar logical width while computing intrinsic logical width (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix typo + Remove Scrollbar calculation from testcase Created 6 years, 3 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 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 continue; 203 continue;
204 204
205 LayoutUnit margin = marginWidthForChild(child); 205 LayoutUnit margin = marginWidthForChild(child);
206 minLogicalWidth += child->minPreferredLogicalWidth() + margin; 206 minLogicalWidth += child->minPreferredLogicalWidth() + margin;
207 maxLogicalWidth += child->maxPreferredLogicalWidth() + margin; 207 maxLogicalWidth += child->maxPreferredLogicalWidth() + margin;
208 } 208 }
209 } 209 }
210 210
211 maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth); 211 maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth);
212 212
213 LayoutUnit scrollbarWidth = instrinsicScrollbarLogicalWidth(); 213 LayoutUnit scrollbarWidth = intrinsicScrollbarLogicalWidth();
214 maxLogicalWidth += scrollbarWidth; 214 maxLogicalWidth += scrollbarWidth;
215 minLogicalWidth += scrollbarWidth; 215 minLogicalWidth += scrollbarWidth;
216 } 216 }
217 217
218 void RenderDeprecatedFlexibleBox::computePreferredLogicalWidths() 218 void RenderDeprecatedFlexibleBox::computePreferredLogicalWidths()
219 { 219 {
220 ASSERT(preferredLogicalWidthsDirty()); 220 ASSERT(preferredLogicalWidthsDirty());
221 221
222 m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = 0; 222 m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = 0;
223 RenderStyle* styleToUse = style(); 223 RenderStyle* styleToUse = style();
(...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after
1062 if (isPseudoElement()) 1062 if (isPseudoElement())
1063 return "RenderDeprecatedFlexibleBox (generated)"; 1063 return "RenderDeprecatedFlexibleBox (generated)";
1064 if (isAnonymous()) 1064 if (isAnonymous())
1065 return "RenderDeprecatedFlexibleBox (generated)"; 1065 return "RenderDeprecatedFlexibleBox (generated)";
1066 if (isRelPositioned()) 1066 if (isRelPositioned())
1067 return "RenderDeprecatedFlexibleBox (relative positioned)"; 1067 return "RenderDeprecatedFlexibleBox (relative positioned)";
1068 return "RenderDeprecatedFlexibleBox"; 1068 return "RenderDeprecatedFlexibleBox";
1069 } 1069 }
1070 1070
1071 } // namespace blink 1071 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698