Title: [280022] trunk
- Revision
- 280022
- Author
- [email protected]
- Date
- 2021-07-19 01:39:01 -0700 (Mon, 19 Jul 2021)
Log Message
[CSS-grid] Ignore the aspect-ratio of a replaced element if stretch alignments are applied to both axes
https://bugs.webkit.org/show_bug.cgi?id=227573
Reviewed by Javier Fernandez.
Source/WebCore:
As discussed in https://github.com/w3c/csswg-drafts/issues/5713, for the replaced element as a grid item,
when both axes have stretch alignments applied and there is no auto margin(s) presented, the aspect ratio
should be ignored if there is any.
Part of this patch is an import of Chromium CL at
https://chromium-review.googlesource.com/c/chromium/src/+/2651651
* rendering/RenderBox.cpp:
(WebCore::RenderBox::hasStretchedLogicalHeight const):
(WebCore::RenderBox::shouldComputeLogicalWidthFromAspectRatio const):
* rendering/RenderBox.h:
LayoutTests:
Two grid WPT tests are now passing.
* TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (280021 => 280022)
--- trunk/LayoutTests/ChangeLog 2021-07-18 22:59:28 UTC (rev 280021)
+++ trunk/LayoutTests/ChangeLog 2021-07-19 08:39:01 UTC (rev 280022)
@@ -1,3 +1,14 @@
+2021-07-19 Ziran Sun <[email protected]>
+
+ [CSS-grid] Ignore the aspect-ratio of a replaced element if stretch alignments are applied to both axes
+ https://bugs.webkit.org/show_bug.cgi?id=227573
+
+ Reviewed by Javier Fernandez.
+
+ Two grid WPT tests are now passing.
+
+ * TestExpectations:
+
2021-07-16 Simon Fraser <[email protected]>
getBoundingClientRect() returns the incorrect rectangle on elements whose parent element is set -webkit-column-count
Modified: trunk/LayoutTests/TestExpectations (280021 => 280022)
--- trunk/LayoutTests/TestExpectations 2021-07-18 22:59:28 UTC (rev 280021)
+++ trunk/LayoutTests/TestExpectations 2021-07-19 08:39:01 UTC (rev 280022)
@@ -1434,8 +1434,6 @@
webkit.org/b/216146 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-baseline-justify-001.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-001.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-002.html [ ImageOnlyFailure ]
-imported/w3c/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-004.html [ ImageOnlyFailure ]
-imported/w3c/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-005.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-006.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-007.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-008.html [ ImageOnlyFailure ]
Modified: trunk/Source/WebCore/ChangeLog (280021 => 280022)
--- trunk/Source/WebCore/ChangeLog 2021-07-18 22:59:28 UTC (rev 280021)
+++ trunk/Source/WebCore/ChangeLog 2021-07-19 08:39:01 UTC (rev 280022)
@@ -1,3 +1,22 @@
+2021-07-19 Ziran Sun <[email protected]>
+
+ [CSS-grid] Ignore the aspect-ratio of a replaced element if stretch alignments are applied to both axes
+ https://bugs.webkit.org/show_bug.cgi?id=227573
+
+ Reviewed by Javier Fernandez.
+
+ As discussed in https://github.com/w3c/csswg-drafts/issues/5713, for the replaced element as a grid item,
+ when both axes have stretch alignments applied and there is no auto margin(s) presented, the aspect ratio
+ should be ignored if there is any.
+
+ Part of this patch is an import of Chromium CL at
+ https://chromium-review.googlesource.com/c/chromium/src/+/2651651
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::hasStretchedLogicalHeight const):
+ (WebCore::RenderBox::shouldComputeLogicalWidthFromAspectRatio const):
+ * rendering/RenderBox.h:
+
2021-07-18 Sam Weinig <[email protected]>
Fix canvas overflow checking to use CheckedArithmatic rather than adhoc floating point mechanism
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (280021 => 280022)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2021-07-18 22:59:28 UTC (rev 280021)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2021-07-19 08:39:01 UTC (rev 280022)
@@ -2760,6 +2760,23 @@
}
// FIXME: Can/Should we move this inside specific layout classes (flex. grid)? Can we refactor columnFlexItemHasStretchAlignment logic?
+bool RenderBox::hasStretchedLogicalHeight() const
+{
+ auto& style = this->style();
+ if (!style.logicalHeight().isAuto() || style.marginBefore().isAuto() || style.marginAfter().isAuto())
+ return false;
+ RenderBlock* containingBlock = this->containingBlock();
+ if (!containingBlock) {
+ // We are evaluating align-self/justify-self, which default to 'normal' for the root element.
+ // The 'normal' value behaves like 'start' except for Flexbox Items, which obviously should have a container.
+ return false;
+ }
+ if (containingBlock->isHorizontalWritingMode() != isHorizontalWritingMode())
+ return style.resolvedJustifySelf(&containingBlock->style(), containingBlock->selfAlignmentNormalBehavior(this)).position() == ItemPosition::Stretch;
+ return style.resolvedAlignSelf(&containingBlock->style(), containingBlock->selfAlignmentNormalBehavior(this)).position() == ItemPosition::Stretch;
+}
+
+// FIXME: Can/Should we move this inside specific layout classes (flex. grid)? Can we refactor columnFlexItemHasStretchAlignment logic?
bool RenderBox::hasStretchedLogicalWidth() const
{
auto& style = this->style();
@@ -5251,6 +5268,9 @@
if (shouldIgnoreAspectRatio())
return false;
+ if (isGridItem() && shouldComputeSizeAsReplaced() && hasStretchedLogicalWidth() && hasStretchedLogicalHeight())
+ return false;
+
auto isResolvablePercentageHeight = [&] {
return style().logicalHeight().isPercentOrCalculated() && (isOutOfFlowPositioned() || percentageLogicalHeightIsResolvable());
};
Modified: trunk/Source/WebCore/rendering/RenderBox.h (280021 => 280022)
--- trunk/Source/WebCore/rendering/RenderBox.h 2021-07-18 22:59:28 UTC (rev 280021)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2021-07-19 08:39:01 UTC (rev 280022)
@@ -436,6 +436,7 @@
// of a containing block). HTML4 buttons, <select>s, <input>s, legends, and floating/compact elements do this.
bool sizesLogicalWidthToFitContent(SizeType) const;
+ bool hasStretchedLogicalHeight() const;
bool hasStretchedLogicalWidth() const;
bool isStretchingColumnFlexItem() const;
bool columnFlexItemHasStretchAlignment() const;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
