Diff
Modified: trunk/LayoutTests/ChangeLog (271002 => 271003)
--- trunk/LayoutTests/ChangeLog 2020-12-19 13:16:03 UTC (rev 271002)
+++ trunk/LayoutTests/ChangeLog 2020-12-19 22:10:14 UTC (rev 271003)
@@ -1,3 +1,14 @@
+2020-12-19 Zalan Bujtas <[email protected]>
+
+ width: max-content with box-sizing: border-box should leave space for padding (Twitter date hover overflow)
+ https://bugs.webkit.org/show_bug.cgi?id=219687
+ <rdar://problem/72137685>
+
+ Reviewed by Antti Koivisto.
+
+ * platform/mac-wk2/TestExpectations:
+ * platform/mac/TestExpectations:
+
2020-12-18 Rini Patel <[email protected]>
[GPU process] Adding more tests to TestExpectations for Layout tests crashes
Modified: trunk/LayoutTests/platform/mac/TestExpectations (271002 => 271003)
--- trunk/LayoutTests/platform/mac/TestExpectations 2020-12-19 13:16:03 UTC (rev 271002)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2020-12-19 22:10:14 UTC (rev 271003)
@@ -2257,6 +2257,4 @@
webkit.org/b/219907 imported/w3c/web-platform-tests/server-timing/service_worker_idl.html [ Pass Failure ]
-webkit.org/b/219687 fast/layoutformattingcontext/max-content-and-box-sizing-simple.html [ ImageOnlyFailure ]
-
webkit.org/b/219965 [ BigSur ] imported/w3c/web-platform-tests/fetch/content-type/script.window.html [ Pass Failure ]
\ No newline at end of file
Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (271002 => 271003)
--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2020-12-19 13:16:03 UTC (rev 271002)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2020-12-19 22:10:14 UTC (rev 271003)
@@ -1316,7 +1316,6 @@
webkit.org/b/217054 fast/layoutformattingcontext/horizontal-sizing-with-trailing-letter-spacing.html [ Skip ]
webkit.org/b/219322 fast/layoutformattingcontext/table-simple-border-collapse.html [ ImageOnlyFailure ]
webkit.org/b/219322 fast/layoutformattingcontext/table-simple-border-collapse2.html [ ImageOnlyFailure ]
-webkit.org/b/219687 fast/layoutformattingcontext/max-content-and-box-sizing-simple.html [ Skip ]
webkit.org/b/220018 webanimations/accelerated-transform-related-animation-property-order.html [ ImageOnlyFailure ]
Modified: trunk/Source/WebCore/ChangeLog (271002 => 271003)
--- trunk/Source/WebCore/ChangeLog 2020-12-19 13:16:03 UTC (rev 271002)
+++ trunk/Source/WebCore/ChangeLog 2020-12-19 22:10:14 UTC (rev 271003)
@@ -1,5 +1,48 @@
2020-12-19 Zalan Bujtas <[email protected]>
+ width: max-content with box-sizing: border-box should leave space for padding (Twitter date hover overflow)
+ https://bugs.webkit.org/show_bug.cgi?id=219687
+ <rdar://problem/72137685>
+
+ Reviewed by Antti Koivisto.
+
+ Non-quantitative values such as auto and min-content are not influenced by the box-sizing property.
+ See http:://www.w3.org/TR/css-sizing-3/#box-sizing
+ (adjustContentBoxLogicalWidthFor* now needs the property type too)
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::computePreferredLogicalWidths):
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::computeIntrinsicLogicalWidths const):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::adjustContentBoxLogicalWidthForBoxSizing const):
+ (WebCore::RenderBox::computeReplacedLogicalWidthUsing const):
+ (WebCore::RenderBox::computePositionedLogicalWidthUsing const):
+ * rendering/RenderBox.h:
+ (WebCore::RenderBox::adjustContentBoxLogicalWidthForBoxSizing const):
+ * rendering/RenderDeprecatedFlexibleBox.cpp:
+ (WebCore::RenderDeprecatedFlexibleBox::computePreferredLogicalWidths):
+ * rendering/RenderFileUploadControl.cpp:
+ (WebCore::RenderFileUploadControl::computePreferredLogicalWidths):
+ * rendering/RenderFragmentContainer.cpp:
+ (WebCore::RenderFragmentContainer::computePreferredLogicalWidths):
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::computeAutoRepeatTracksCount const):
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::computePreferredLogicalWidths):
+ * rendering/RenderMenuList.cpp:
+ (RenderMenuList::computePreferredLogicalWidths):
+ * rendering/RenderReplaced.cpp:
+ (WebCore::RenderReplaced::computePreferredLogicalWidths):
+ * rendering/RenderSlider.cpp:
+ (WebCore::RenderSlider::computePreferredLogicalWidths):
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::computePreferredLogicalWidths):
+ * rendering/RenderTextControl.cpp:
+ (WebCore::RenderTextControl::computePreferredLogicalWidths):
+
+2020-12-19 Zalan Bujtas <[email protected]>
+
[LFC][IFC] Add fast path vertical alignment for non-stretchy, baseline aligned atomic inline level boxes
https://bugs.webkit.org/show_bug.cgi?id=219962
Modified: trunk/Source/WebCore/rendering/AutoTableLayout.cpp (271002 => 271003)
--- trunk/Source/WebCore/rendering/AutoTableLayout.cpp 2020-12-19 13:16:03 UTC (rev 271002)
+++ trunk/Source/WebCore/rendering/AutoTableLayout.cpp 2020-12-19 22:10:14 UTC (rev 271003)
@@ -95,7 +95,7 @@
case Fixed:
// ignore width=0
if (cellLogicalWidth.isPositive() && !columnLayout.logicalWidth.isPercentOrCalculated()) {
- float logicalWidth = cell->adjustBorderBoxLogicalWidthForBoxSizing(cellLogicalWidth.value());
+ float logicalWidth = cell->adjustBorderBoxLogicalWidthForBoxSizing(cellLogicalWidth);
if (columnLayout.logicalWidth.isFixed()) {
// Nav/IE weirdness
if ((logicalWidth > columnLayout.logicalWidth.value())
Modified: trunk/Source/WebCore/rendering/FixedTableLayout.cpp (271002 => 271003)
--- trunk/Source/WebCore/rendering/FixedTableLayout.cpp 2020-12-19 13:16:03 UTC (rev 271002)
+++ trunk/Source/WebCore/rendering/FixedTableLayout.cpp 2020-12-19 22:10:14 UTC (rev 271003)
@@ -142,7 +142,7 @@
// FIXME: Support other length types. If the width is non-auto, it should probably just use
// RenderBox::computeLogicalWidthInFragmentUsing to compute the width.
if (logicalWidth.isFixed() && logicalWidth.isPositive()) {
- fixedBorderBoxLogicalWidth = cell->adjustBorderBoxLogicalWidthForBoxSizing(logicalWidth.value());
+ fixedBorderBoxLogicalWidth = cell->adjustBorderBoxLogicalWidthForBoxSizing(logicalWidth);
logicalWidth.setValue(Fixed, fixedBorderBoxLogicalWidth);
}
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (271002 => 271003)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2020-12-19 13:16:03 UTC (rev 271002)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2020-12-19 22:10:14 UTC (rev 271003)
@@ -2280,18 +2280,18 @@
const RenderStyle& styleToUse = style();
if (!isTableCell() && styleToUse.logicalWidth().isFixed() && styleToUse.logicalWidth().value() >= 0
&& !(isDeprecatedFlexItem() && !styleToUse.logicalWidth().intValue()))
- m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalWidth().value());
+ m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalWidth());
else
computeIntrinsicLogicalWidths(m_minPreferredLogicalWidth, m_maxPreferredLogicalWidth);
if (styleToUse.logicalMaxWidth().isFixed()) {
- m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMaxWidth().value()));
- m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMaxWidth().value()));
+ m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMaxWidth()));
+ m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMaxWidth()));
}
if (styleToUse.logicalMinWidth().isFixed() && styleToUse.logicalMinWidth().value() > 0) {
- m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMinWidth().value()));
- m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMinWidth().value()));
+ m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMinWidth()));
+ m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMinWidth()));
}
LayoutUnit borderAndPadding = borderAndPaddingLogicalWidth();
Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (271002 => 271003)
--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2020-12-19 13:16:03 UTC (rev 271002)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2020-12-19 22:10:14 UTC (rev 271003)
@@ -356,7 +356,7 @@
if (is<RenderTableCell>(*this)) {
Length tableCellWidth = downcast<RenderTableCell>(*this).styleOrColLogicalWidth();
if (tableCellWidth.isFixed() && tableCellWidth.value() > 0)
- maxLogicalWidth = std::max(minLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(tableCellWidth.value()));
+ maxLogicalWidth = std::max(minLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(tableCellWidth));
}
int scrollbarWidth = intrinsicScrollbarLogicalWidth();
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (271002 => 271003)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2020-12-19 13:16:03 UTC (rev 271002)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2020-12-19 22:10:14 UTC (rev 271003)
@@ -1231,14 +1231,22 @@
gOverridingContainingBlockContentLogicalHeightMap->remove(this);
}
-LayoutUnit RenderBox::adjustBorderBoxLogicalWidthForBoxSizing(LayoutUnit width) const
+LayoutUnit RenderBox::adjustBorderBoxLogicalWidthForBoxSizing(const Length& logicalWidth) const
{
+ auto width = LayoutUnit { logicalWidth.value() };
LayoutUnit bordersPlusPadding = borderAndPaddingLogicalWidth();
- if (style().boxSizing() == BoxSizing::ContentBox)
+ if (style().boxSizing() == BoxSizing::ContentBox || logicalWidth.isIntrinsicOrAuto())
return width + bordersPlusPadding;
return std::max(width, bordersPlusPadding);
}
+LayoutUnit RenderBox::adjustBorderBoxLogicalWidthForBoxSizing(LayoutUnit computedLogicalWidth, LengthType originalType) const
+{
+ if (originalType == Calculated)
+ return adjustBorderBoxLogicalWidthForBoxSizing({ computedLogicalWidth, Fixed, false });
+ return adjustBorderBoxLogicalWidthForBoxSizing({ computedLogicalWidth, originalType, false });
+}
+
LayoutUnit RenderBox::adjustBorderBoxLogicalHeightForBoxSizing(LayoutUnit height) const
{
LayoutUnit bordersPlusPadding = borderAndPaddingLogicalHeight();
@@ -1247,13 +1255,21 @@
return std::max(height, bordersPlusPadding);
}
-LayoutUnit RenderBox::adjustContentBoxLogicalWidthForBoxSizing(LayoutUnit width) const
+LayoutUnit RenderBox::adjustContentBoxLogicalWidthForBoxSizing(const Length& logicalWidth) const
{
- if (style().boxSizing() == BoxSizing::BorderBox)
- width -= borderAndPaddingLogicalWidth();
- return std::max<LayoutUnit>(0, width);
+ auto width = LayoutUnit { logicalWidth.value() };
+ if (style().boxSizing() == BoxSizing::ContentBox || logicalWidth.isIntrinsicOrAuto())
+ return std::max(0_lu, width);
+ return std::max(0_lu, width - borderAndPaddingLogicalWidth());
}
+LayoutUnit RenderBox::adjustContentBoxLogicalWidthForBoxSizing(LayoutUnit computedLogicalWidth, LengthType originalType) const
+{
+ if (originalType == Calculated)
+ return adjustContentBoxLogicalWidthForBoxSizing({ computedLogicalWidth, Fixed, false });
+ return adjustContentBoxLogicalWidthForBoxSizing({ computedLogicalWidth, originalType, false });
+}
+
LayoutUnit RenderBox::adjustContentBoxLogicalHeightForBoxSizing(Optional<LayoutUnit> height) const
{
if (!height)
@@ -2573,11 +2589,11 @@
{
ASSERT(widthType == MinSize || widthType == MainOrPreferredSize || !logicalWidth.isAuto());
if (widthType == MinSize && logicalWidth.isAuto())
- return adjustBorderBoxLogicalWidthForBoxSizing(0);
+ return adjustBorderBoxLogicalWidthForBoxSizing(0, logicalWidth.type());
if (!logicalWidth.isIntrinsicOrAuto()) {
// FIXME: If the containing block flow is perpendicular to our direction we need to use the available logical height instead.
- return adjustBorderBoxLogicalWidthForBoxSizing(valueForLength(logicalWidth, availableLogicalWidth));
+ return adjustBorderBoxLogicalWidthForBoxSizing(valueForLength(logicalWidth, availableLogicalWidth), logicalWidth.type());
}
if (logicalWidth.isIntrinsic())
@@ -3113,11 +3129,11 @@
{
ASSERT(widthType == MinSize || widthType == MainOrPreferredSize || !logicalWidth.isAuto());
if (widthType == MinSize && logicalWidth.isAuto())
- return adjustContentBoxLogicalWidthForBoxSizing(0);
+ return adjustContentBoxLogicalWidthForBoxSizing(0, logicalWidth.type());
switch (logicalWidth.type()) {
case Fixed:
- return adjustContentBoxLogicalWidthForBoxSizing(logicalWidth.value());
+ return adjustContentBoxLogicalWidthForBoxSizing(logicalWidth);
case MinContent:
case MaxContent: {
// MinContent/MaxContent don't need the availableLogicalWidth argument.
@@ -3138,7 +3154,7 @@
if (logicalWidth.isIntrinsic())
return computeIntrinsicLogicalWidthUsing(logicalWidth, cw, borderAndPaddingLogicalWidth()) - borderAndPaddingLogicalWidth();
if (cw > 0 || (!cw && (containerLogicalWidth.isFixed() || containerLogicalWidth.isPercentOrCalculated())))
- return adjustContentBoxLogicalWidthForBoxSizing(minimumValueForLength(logicalWidth, cw));
+ return adjustContentBoxLogicalWidthForBoxSizing(minimumValueForLength(logicalWidth, cw), logicalWidth.type());
return 0_lu;
}
case Intrinsic:
@@ -3696,6 +3712,7 @@
LogicalExtentComputedValues& computedValues) const
{
ASSERT(widthType == MinSize || widthType == MainOrPreferredSize || !logicalWidth.isAuto());
+ auto originalLogicalWidthType = logicalWidth.type();
if (widthType == MinSize && logicalWidth.isAuto())
logicalWidth = Length(0, Fixed);
else if (logicalWidth.isIntrinsic())
@@ -3732,7 +3749,7 @@
// case because the value is not used for any further calculations.
logicalLeftValue = valueForLength(logicalLeft, containerLogicalWidth);
- computedValues.m_extent = adjustContentBoxLogicalWidthForBoxSizing(valueForLength(logicalWidth, containerLogicalWidth));
+ computedValues.m_extent = adjustContentBoxLogicalWidthForBoxSizing(valueForLength(logicalWidth, containerLogicalWidth), originalLogicalWidthType);
const LayoutUnit availableSpace = containerLogicalWidth - (logicalLeftValue + computedValues.m_extent + valueForLength(logicalRight, containerLogicalWidth) + bordersPlusPadding);
@@ -3842,7 +3859,7 @@
computedValues.m_extent = std::min(std::max(preferredMinWidth, availableWidth), preferredWidth);
} else if (logicalLeftIsAuto && !logicalWidthIsAuto && !logicalRightIsAuto) {
// RULE 4: (solve for left)
- computedValues.m_extent = adjustContentBoxLogicalWidthForBoxSizing(valueForLength(logicalWidth, containerLogicalWidth));
+ computedValues.m_extent = adjustContentBoxLogicalWidthForBoxSizing(valueForLength(logicalWidth, containerLogicalWidth), originalLogicalWidthType);
logicalLeftValue = availableSpace - (computedValues.m_extent + valueForLength(logicalRight, containerLogicalWidth));
} else if (!logicalLeftIsAuto && logicalWidthIsAuto && !logicalRightIsAuto) {
// RULE 5: (solve for width)
@@ -3851,7 +3868,7 @@
} else if (!logicalLeftIsAuto && !logicalWidthIsAuto && logicalRightIsAuto) {
// RULE 6: (no need solve for right)
logicalLeftValue = valueForLength(logicalLeft, containerLogicalWidth);
- computedValues.m_extent = adjustContentBoxLogicalWidthForBoxSizing(valueForLength(logicalWidth, containerLogicalWidth));
+ computedValues.m_extent = adjustContentBoxLogicalWidthForBoxSizing(valueForLength(logicalWidth, containerLogicalWidth), originalLogicalWidthType);
}
}
Modified: trunk/Source/WebCore/rendering/RenderBox.h (271002 => 271003)
--- trunk/Source/WebCore/rendering/RenderBox.h 2020-12-19 13:16:03 UTC (rev 271002)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2020-12-19 22:10:14 UTC (rev 271003)
@@ -335,12 +335,15 @@
LayoutSize offsetFromContainer(RenderElement&, const LayoutPoint&, bool* offsetDependsOnPoint = nullptr) const override;
- LayoutUnit adjustBorderBoxLogicalWidthForBoxSizing(LayoutUnit width) const;
- LayoutUnit adjustContentBoxLogicalWidthForBoxSizing(LayoutUnit width) const;
+ LayoutUnit adjustBorderBoxLogicalWidthForBoxSizing(const Length& logicalWidth) const;
+ LayoutUnit adjustContentBoxLogicalWidthForBoxSizing(const Length& logicalWidth) const;
- template<typename T> LayoutUnit adjustBorderBoxLogicalWidthForBoxSizing(T width) const { return adjustBorderBoxLogicalWidthForBoxSizing(LayoutUnit(width)); }
- template<typename T> LayoutUnit adjustContentBoxLogicalWidthForBoxSizing(T width) const { return adjustContentBoxLogicalWidthForBoxSizing(LayoutUnit(width)); }
+ LayoutUnit adjustBorderBoxLogicalWidthForBoxSizing(LayoutUnit computedLogicalWidth, LengthType originalType) const;
+ LayoutUnit adjustContentBoxLogicalWidthForBoxSizing(LayoutUnit computedLogicalWidth, LengthType originalType) const;
+ template<typename T> LayoutUnit adjustBorderBoxLogicalWidthForBoxSizing(T computedLogicalWidth, LengthType originalType) const { return adjustBorderBoxLogicalWidthForBoxSizing(LayoutUnit(computedLogicalWidth), originalType); }
+ template<typename T> LayoutUnit adjustContentBoxLogicalWidthForBoxSizing(T computedLogicalWidth, LengthType originalType) const { return adjustContentBoxLogicalWidthForBoxSizing(LayoutUnit(computedLogicalWidth), originalType); }
+
// Overridden by fieldsets to subtract out the intrinsic border.
virtual LayoutUnit adjustBorderBoxLogicalHeightForBoxSizing(LayoutUnit height) const;
virtual LayoutUnit adjustContentBoxLogicalHeightForBoxSizing(Optional<LayoutUnit> height) const;
Modified: trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (271002 => 271003)
--- trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2020-12-19 13:16:03 UTC (rev 271002)
+++ trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2020-12-19 22:10:14 UTC (rev 271003)
@@ -223,18 +223,18 @@
m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = 0;
if (style().width().isFixed() && style().width().value() > 0)
- m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(style().width().value());
+ m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(style().width());
else
computeIntrinsicLogicalWidths(m_minPreferredLogicalWidth, m_maxPreferredLogicalWidth);
if (style().minWidth().isFixed() && style().minWidth().value() > 0) {
- m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().minWidth().value()));
- m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().minWidth().value()));
+ m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().minWidth()));
+ m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().minWidth()));
}
if (style().maxWidth().isFixed()) {
- m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth().value()));
- m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth().value()));
+ m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth()));
+ m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth()));
}
LayoutUnit borderAndPadding = borderAndPaddingLogicalWidth();
Modified: trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp (271002 => 271003)
--- trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp 2020-12-19 13:16:03 UTC (rev 271002)
+++ trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp 2020-12-19 22:10:14 UTC (rev 271003)
@@ -224,18 +224,18 @@
m_maxPreferredLogicalWidth = 0;
if (style().width().isFixed() && style().width().value() > 0)
- m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(style().width().value());
+ m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(style().width());
else
computeIntrinsicLogicalWidths(m_minPreferredLogicalWidth, m_maxPreferredLogicalWidth);
if (style().minWidth().isFixed() && style().minWidth().value() > 0) {
- m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().minWidth().value()));
- m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().minWidth().value()));
+ m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().minWidth()));
+ m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().minWidth()));
}
if (style().maxWidth().isFixed()) {
- m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth().value()));
- m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth().value()));
+ m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth()));
+ m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth()));
}
int toAdd = horizontalBorderAndPaddingExtent();
Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (271002 => 271003)
--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2020-12-19 13:16:03 UTC (rev 271002)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2020-12-19 22:10:14 UTC (rev 271003)
@@ -780,7 +780,7 @@
crossSize = adjustForBoxSizing(*this, containerCrossSizeLength);
} else {
ASSERT(crossSizeLength.isPercentOrCalculated());
- crossSize = mainAxisIsChildInlineAxis(child) ? child.computePercentageLogicalHeight(crossSizeLength) : adjustBorderBoxLogicalWidthForBoxSizing(valueForLength(crossSizeLength, contentWidth()));
+ crossSize = mainAxisIsChildInlineAxis(child) ? child.computePercentageLogicalHeight(crossSizeLength) : adjustBorderBoxLogicalWidthForBoxSizing(valueForLength(crossSizeLength, contentWidth()), crossSizeLength.type());
if (!crossSize)
return 0_lu;
}
Modified: trunk/Source/WebCore/rendering/RenderFragmentContainer.cpp (271002 => 271003)
--- trunk/Source/WebCore/rendering/RenderFragmentContainer.cpp 2020-12-19 13:16:03 UTC (rev 271002)
+++ trunk/Source/WebCore/rendering/RenderFragmentContainer.cpp 2020-12-19 22:10:14 UTC (rev 271003)
@@ -374,18 +374,18 @@
const RenderStyle& styleToUse = style();
if (styleToUse.logicalWidth().isFixed() && styleToUse.logicalWidth().value() > 0)
- m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalWidth().value());
+ m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalWidth());
else
computeIntrinsicLogicalWidths(m_minPreferredLogicalWidth, m_maxPreferredLogicalWidth);
if (styleToUse.logicalMinWidth().isFixed() && styleToUse.logicalMinWidth().value() > 0) {
- m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMinWidth().value()));
- m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMinWidth().value()));
+ m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMinWidth()));
+ m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMinWidth()));
}
if (styleToUse.logicalMaxWidth().isFixed()) {
- m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMaxWidth().value()));
- m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMaxWidth().value()));
+ m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMaxWidth()));
+ m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMaxWidth()));
}
LayoutUnit borderAndPadding = borderAndPaddingLogicalWidth();
Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (271002 => 271003)
--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2020-12-19 13:16:03 UTC (rev 271002)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2020-12-19 22:10:14 UTC (rev 271003)
@@ -466,7 +466,7 @@
if (maxSize.isPercentOrCalculated())
containingBlockAvailableSize = isRowAxis ? containingBlockLogicalWidthForContent() : containingBlockLogicalHeightForContent(ExcludeMarginBorderPadding);
LayoutUnit maxSizeValue = valueForLength(maxSize, containingBlockAvailableSize.valueOr(LayoutUnit()));
- availableMaxSize = isRowAxis ? adjustContentBoxLogicalWidthForBoxSizing(maxSizeValue) : adjustContentBoxLogicalHeightForBoxSizing(maxSizeValue);
+ availableMaxSize = isRowAxis ? adjustContentBoxLogicalWidthForBoxSizing(maxSizeValue, maxSize.type()) : adjustContentBoxLogicalHeightForBoxSizing(maxSizeValue);
}
const Length& minSize = isRowAxis ? style().logicalMinWidth() : style().logicalMinHeight();
@@ -478,7 +478,7 @@
if (!containingBlockAvailableSize && minSize.isPercentOrCalculated())
containingBlockAvailableSize = isRowAxis ? containingBlockLogicalWidthForContent() : containingBlockLogicalHeightForContent(ExcludeMarginBorderPadding);
LayoutUnit minSizeValue = valueForLength(minSize, containingBlockAvailableSize.valueOr(LayoutUnit()));
- availableMinSize = isRowAxis ? adjustContentBoxLogicalWidthForBoxSizing(minSizeValue) : adjustContentBoxLogicalHeightForBoxSizing(minSizeValue);
+ availableMinSize = isRowAxis ? adjustContentBoxLogicalWidthForBoxSizing(minSizeValue, minSize.type()) : adjustContentBoxLogicalHeightForBoxSizing(minSizeValue);
if (!maxSize.isSpecified())
needsToFulfillMinimumSize = true;
}
Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (271002 => 271003)
--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2020-12-19 13:16:03 UTC (rev 271002)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2020-12-19 22:10:14 UTC (rev 271003)
@@ -226,18 +226,18 @@
m_maxPreferredLogicalWidth = 0;
if (style().width().isFixed() && style().width().value() > 0)
- m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(style().width().value());
+ m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(style().width());
else
computeIntrinsicLogicalWidths(m_minPreferredLogicalWidth, m_maxPreferredLogicalWidth);
if (style().minWidth().isFixed() && style().minWidth().value() > 0) {
- m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().minWidth().value()));
- m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().minWidth().value()));
+ m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().minWidth()));
+ m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().minWidth()));
}
if (style().maxWidth().isFixed()) {
- m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth().value()));
- m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth().value()));
+ m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth()));
+ m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth()));
}
LayoutUnit toAdd = horizontalBorderAndPaddingExtent();
Modified: trunk/Source/WebCore/rendering/RenderMenuList.cpp (271002 => 271003)
--- trunk/Source/WebCore/rendering/RenderMenuList.cpp 2020-12-19 13:16:03 UTC (rev 271002)
+++ trunk/Source/WebCore/rendering/RenderMenuList.cpp 2020-12-19 22:10:14 UTC (rev 271003)
@@ -326,18 +326,18 @@
m_maxPreferredLogicalWidth = 0;
if (style().width().isFixed() && style().width().value() > 0)
- m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(style().width().value());
+ m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(style().width());
else
computeIntrinsicLogicalWidths(m_minPreferredLogicalWidth, m_maxPreferredLogicalWidth);
if (style().minWidth().isFixed() && style().minWidth().value() > 0) {
- m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().minWidth().value()));
- m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().minWidth().value()));
+ m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().minWidth()));
+ m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().minWidth()));
}
if (style().maxWidth().isFixed()) {
- m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth().value()));
- m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth().value()));
+ m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth()));
+ m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth()));
}
LayoutUnit toAdd = horizontalBorderAndPaddingExtent();
Modified: trunk/Source/WebCore/rendering/RenderReplaced.cpp (271002 => 271003)
--- trunk/Source/WebCore/rendering/RenderReplaced.cpp 2020-12-19 13:16:03 UTC (rev 271002)
+++ trunk/Source/WebCore/rendering/RenderReplaced.cpp 2020-12-19 22:10:14 UTC (rev 271003)
@@ -663,13 +663,13 @@
m_minPreferredLogicalWidth = 0;
if (styleToUse.logicalMinWidth().isFixed() && styleToUse.logicalMinWidth().value() > 0) {
- m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMinWidth().value()));
- m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMinWidth().value()));
+ m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMinWidth()));
+ m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMinWidth()));
}
if (styleToUse.logicalMaxWidth().isFixed()) {
- m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMaxWidth().value()));
- m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMaxWidth().value()));
+ m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMaxWidth()));
+ m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMaxWidth()));
}
LayoutUnit borderAndPadding = borderAndPaddingLogicalWidth();
Modified: trunk/Source/WebCore/rendering/RenderSlider.cpp (271002 => 271003)
--- trunk/Source/WebCore/rendering/RenderSlider.cpp 2020-12-19 13:16:03 UTC (rev 271002)
+++ trunk/Source/WebCore/rendering/RenderSlider.cpp 2020-12-19 22:10:14 UTC (rev 271003)
@@ -80,18 +80,18 @@
m_maxPreferredLogicalWidth = 0;
if (style().width().isFixed() && style().width().value() > 0)
- m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(style().width().value());
+ m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(style().width());
else
computeIntrinsicLogicalWidths(m_minPreferredLogicalWidth, m_maxPreferredLogicalWidth);
if (style().minWidth().isFixed() && style().minWidth().value() > 0) {
- m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().minWidth().value()));
- m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().minWidth().value()));
+ m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().minWidth()));
+ m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().minWidth()));
}
if (style().maxWidth().isFixed()) {
- m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth().value()));
- m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth().value()));
+ m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth()));
+ m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth()));
}
LayoutUnit toAdd = horizontalBorderAndPaddingExtent();
Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (271002 => 271003)
--- trunk/Source/WebCore/rendering/RenderTable.cpp 2020-12-19 13:16:03 UTC (rev 271002)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2020-12-19 22:10:14 UTC (rev 271003)
@@ -824,13 +824,13 @@
auto& styleToUse = style();
// FIXME: This should probably be checking for isSpecified since you should be able to use percentage or calc values for min-width.
if (styleToUse.logicalMinWidth().isFixed() && styleToUse.logicalMinWidth().value() > 0) {
- m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMinWidth().value()));
- m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMinWidth().value()));
+ m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMinWidth()));
+ m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMinWidth()));
}
// FIXME: This should probably be checking for isSpecified since you should be able to use percentage or calc values for maxWidth.
if (styleToUse.logicalMaxWidth().isFixed()) {
- m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMaxWidth().value()));
+ m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMaxWidth()));
m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, m_minPreferredLogicalWidth);
}
Modified: trunk/Source/WebCore/rendering/RenderTextControl.cpp (271002 => 271003)
--- trunk/Source/WebCore/rendering/RenderTextControl.cpp 2020-12-19 13:16:03 UTC (rev 271002)
+++ trunk/Source/WebCore/rendering/RenderTextControl.cpp 2020-12-19 22:10:14 UTC (rev 271003)
@@ -172,18 +172,18 @@
m_maxPreferredLogicalWidth = 0;
if (style().logicalWidth().isFixed() && style().logicalWidth().value() >= 0)
- m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(style().logicalWidth().value());
+ m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(style().logicalWidth());
else
computeIntrinsicLogicalWidths(m_minPreferredLogicalWidth, m_maxPreferredLogicalWidth);
if (style().logicalMinWidth().isFixed() && style().logicalMinWidth().value() > 0) {
- m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().logicalMinWidth().value()));
- m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().logicalMinWidth().value()));
+ m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().logicalMinWidth()));
+ m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().logicalMinWidth()));
}
if (style().logicalMaxWidth().isFixed()) {
- m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().logicalMaxWidth().value()));
- m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().logicalMaxWidth().value()));
+ m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().logicalMaxWidth()));
+ m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().logicalMaxWidth()));
}
LayoutUnit toAdd = borderAndPaddingLogicalWidth();