source: webkit/trunk/Source/WebCore/rendering/FlexibleBoxAlgorithm.cpp

Last change on this file was 278865, checked in by [email protected], 4 years ago

[css-flexbox] Do not compute the min-max sizes of flex items twice
https://bugs.webkit.org/show_bug.cgi?id=226463

Reviewed by Simon Fraser.

When determining the flex base size, the item’s min and max main sizes are ignored (no clamping occurs).
Those limits are used to compute the item's hypothetical main size and also later when the flexible
lengths are resolved. The thing is that we were running the code that clamps the flex item size twice instead
of computing those limits once and apply them twice.

From now one, we just compute them once and store the limits in a std::pair in the FlexItem class. This means
that the FlexItem is able to compute the hypothetical main size on its own and does not need it to be passed
as an argument.

No new tests as this is already being tested by dozens of tests.

  • rendering/FlexibleBoxAlgorithm.cpp:

(WebCore::FlexItem::FlexItem):
(WebCore::FlexItem::constrainSizeByMinMax const): Clamp the passed in size by the stored min & max sizes.

  • rendering/FlexibleBoxAlgorithm.h:
  • rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::computeFlexItemMinMaxSizes): Renamed from adjustChildSizeForMinAndMax and
without the childSize argument which is no longer needed.
(WebCore::RenderFlexibleBox::constructFlexItem): Use constrainSizeByMinMax.
(WebCore::RenderFlexibleBox::resolveFlexibleLengths): Ditto.
(WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax): Deleted.

  • rendering/RenderFlexibleBox.h:
File size: 4.3 KB
Line 
1/*
2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are
6 * met:
7 *
8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above
11 * copyright notice, this list of conditions and the following disclaimer
12 * in the documentation and/or other materials provided with the
13 * distribution.
14 * * Neither the name of Google Inc. nor the names of its
15 * contributors may be used to endorse or promote products derived from
16 * this software without specific prior written permission.
17 *
18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */
30
31#include "config.h"
32#include "FlexibleBoxAlgorithm.h"
33
34#include "RenderBox.h"
35
36namespace WebCore {
37
38FlexItem::FlexItem(RenderBox& box, LayoutUnit flexBaseContentSize, LayoutUnit mainAxisBorderAndPadding, LayoutUnit mainAxisMargin, std::pair<LayoutUnit, LayoutUnit> minMaxSizes, bool everHadLayout)
39 : box(box)
40 , flexBaseContentSize(flexBaseContentSize)
41 , mainAxisBorderAndPadding(mainAxisBorderAndPadding)
42 , mainAxisMargin(mainAxisMargin)
43 , minMaxSizes(minMaxSizes)
44 , hypotheticalMainContentSize(constrainSizeByMinMax(flexBaseContentSize))
45 , frozen(false)
46 , everHadLayout(everHadLayout)
47{
48 ASSERT(!box.isOutOfFlowPositioned());
49}
50
51FlexLayoutAlgorithm::FlexLayoutAlgorithm(const RenderStyle& style, LayoutUnit lineBreakLength, const Vector<FlexItem>& allItems, LayoutUnit gapBetweenItems, LayoutUnit gapBetweenLines)
52 : m_style(style)
53 , m_lineBreakLength(lineBreakLength)
54 , m_allItems(allItems)
55 , m_gapBetweenItems(gapBetweenItems)
56 , m_gapBetweenLines(gapBetweenLines)
57{
58}
59
60bool FlexLayoutAlgorithm::computeNextFlexLine(size_t& nextIndex, Vector<FlexItem>& lineItems, LayoutUnit& sumFlexBaseSize, double& totalFlexGrow, double& totalFlexShrink, double& totalWeightedFlexShrink, LayoutUnit& sumHypotheticalMainSize)
61{
62 lineItems.clear();
63 sumFlexBaseSize = 0_lu;
64 totalFlexGrow = totalFlexShrink = totalWeightedFlexShrink = 0;
65 sumHypotheticalMainSize = 0_lu;
66
67 for (; nextIndex < m_allItems.size(); ++nextIndex) {
68 const auto& flexItem = m_allItems[nextIndex];
69 ASSERT(!flexItem.box.isOutOfFlowPositioned());
70 if (isMultiline() && sumHypotheticalMainSize + flexItem.hypotheticalMainAxisMarginBoxSize() > m_lineBreakLength && !lineItems.isEmpty())
71 break;
72 lineItems.append(flexItem);
73 sumFlexBaseSize += flexItem.flexBaseMarginBoxSize() + m_gapBetweenItems;
74 totalFlexGrow += flexItem.box.style().flexGrow();
75 totalFlexShrink += flexItem.box.style().flexShrink();
76 totalWeightedFlexShrink += flexItem.box.style().flexShrink() * flexItem.flexBaseContentSize;
77 sumHypotheticalMainSize += flexItem.hypotheticalMainAxisMarginBoxSize() + m_gapBetweenItems;
78 }
79
80 if (!lineItems.isEmpty()) {
81 // We added a gap after every item but there shouldn't be one after the last item, so subtract it here. Note that
82 // sums might be negative here due to negative margins in flex items.
83 sumHypotheticalMainSize -= m_gapBetweenItems;
84 sumFlexBaseSize -= m_gapBetweenItems;
85 }
86
87 ASSERT(lineItems.size() > 0 || nextIndex == m_allItems.size());
88 return lineItems.size() > 0;
89}
90
91LayoutUnit FlexItem::constrainSizeByMinMax(const LayoutUnit size) const
92{
93 return std::max(minMaxSizes.first, std::min(size, minMaxSizes.second));
94}
95
96} // namespace WebCore
Note: See TracBrowser for help on using the repository browser.