Diff
Modified: trunk/LayoutTests/ChangeLog (285856 => 285857)
--- trunk/LayoutTests/ChangeLog 2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/LayoutTests/ChangeLog 2021-11-16 11:41:05 UTC (rev 285857)
@@ -1,3 +1,28 @@
+2021-11-16 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r280078, r280290 and r282008.
+ https://bugs.webkit.org/show_bug.cgi?id=233184
+
+ Caused a crash in grid
+
+ Reverted changesets:
+
+ "Images as grid items should use the overridingLogicalWidth
+ when defined to compute the logical Height"
+ https://bugs.webkit.org/show_bug.cgi?id=228022
+ https://commits.webkit.org/r280078
+
+ "[css-grid] svg image as grid items should use the overriding
+ logical width/height when defined to compute the logical
+ height/width"
+ https://bugs.webkit.org/show_bug.cgi?id=228105
+ https://commits.webkit.org/r280290
+
+ "REGRESSION(r280078): broke fast/images/exif-orientation-
+ composited.html on windows"
+ https://bugs.webkit.org/show_bug.cgi?id=228325
+ https://commits.webkit.org/r282008
+
2021-11-16 Arcady Goldmints-Orlov <[email protected]>
[GLIB] Update test expectations and baselines. Unreviewed test gardening.
Modified: trunk/LayoutTests/TestExpectations (285856 => 285857)
--- trunk/LayoutTests/TestExpectations 2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/LayoutTests/TestExpectations 2021-11-16 11:41:05 UTC (rev 285857)
@@ -1388,6 +1388,9 @@
imported/w3c/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-015.html [ Pass Failure ]
webkit.org/b/216146 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-baseline-align-001.html [ ImageOnlyFailure ]
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-002.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 ]
imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-dynamic-001.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-repeat-max-width-001.html [ ImageOnlyFailure ]
@@ -4316,6 +4319,10 @@
webkit.org/b/209460 imported/w3c/web-platform-tests/css/css-grid/abspos/descendant-static-position-002.html [ ImageOnlyFailure ]
webkit.org/b/209460 imported/w3c/web-platform-tests/css/css-grid/abspos/descendant-static-position-003.html [ ImageOnlyFailure ]
webkit.org/b/212201 imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-limits-001.html [ Skip ]
+webkit.org/b/227900 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-1.html [ ImageOnlyFailure ]
+webkit.org/b/227900 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-2.html [ ImageOnlyFailure ]
+webkit.org/b/227900 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-3.html [ ImageOnlyFailure ]
+webkit.org/b/227900 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-4.html [ ImageOnlyFailure ]
webkit.org/b/212246 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-baseline-align-cycles-001.html [ ImageOnlyFailure ]
webkit.org/b/231021 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-inline-baseline.html [ ImageOnlyFailure ]
webkit.org/b/212246 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-content-baseline-001.html [ ImageOnlyFailure ]
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (285856 => 285857)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2021-11-16 11:41:05 UTC (rev 285857)
@@ -1,3 +1,28 @@
+2021-11-16 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r280078, r280290 and r282008.
+ https://bugs.webkit.org/show_bug.cgi?id=233184
+
+ Caused a crash in grid
+
+ Reverted changesets:
+
+ "Images as grid items should use the overridingLogicalWidth
+ when defined to compute the logical Height"
+ https://bugs.webkit.org/show_bug.cgi?id=228022
+ https://commits.webkit.org/r280078
+
+ "[css-grid] svg image as grid items should use the overriding
+ logical width/height when defined to compute the logical
+ height/width"
+ https://bugs.webkit.org/show_bug.cgi?id=228105
+ https://commits.webkit.org/r280290
+
+ "REGRESSION(r280078): broke fast/images/exif-orientation-
+ composited.html on windows"
+ https://bugs.webkit.org/show_bug.cgi?id=228325
+ https://commits.webkit.org/r282008
+
2021-11-15 Tim Nguyen <[email protected]>
Re-import css/css-text-decor WPT
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-029-expected.txt (285856 => 285857)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-029-expected.txt 2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-029-expected.txt 2021-11-16 11:41:05 UTC (rev 285857)
@@ -1,5 +1,7 @@
-PASS .before 1
+FAIL .before 1 assert_equals:
+<img id="item" src="" class=" before" data-expected-width="200" data-expected-height="200">
+height expected 200 but got 100
PASS .after 2
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-030-expected.txt (285856 => 285857)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-030-expected.txt 2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-030-expected.txt 2021-11-16 11:41:05 UTC (rev 285857)
@@ -1,5 +1,7 @@
PASS .before 1
-PASS .after 2
+FAIL .after 2 assert_equals:
+<img id="item" src="" class=" before after" data-expected-width="200" data-expected-height="200">
+height expected 200 but got 100
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-031-expected.txt (285856 => 285857)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-031-expected.txt 2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-031-expected.txt 2021-11-16 11:41:05 UTC (rev 285857)
@@ -1,5 +1,7 @@
-PASS .before 1
+FAIL .before 1 assert_equals:
+<img id="item" src="" class=" before" data-expected-width="200" data-expected-height="200">
+height expected 200 but got 100
PASS .after 2
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-035-expected.txt (285856 => 285857)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-035-expected.txt 2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-035-expected.txt 2021-11-16 11:41:05 UTC (rev 285857)
@@ -1,5 +1,7 @@
PASS .before 1
-PASS .after 2
+FAIL .after 2 assert_equals:
+<img id="item" src="" class=" before after" data-expected-width="80" data-expected-height="80">
+height expected 80 but got 100
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-036-expected.txt (285856 => 285857)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-036-expected.txt 2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-036-expected.txt 2021-11-16 11:41:05 UTC (rev 285857)
@@ -1,5 +1,7 @@
-PASS .before 1
+FAIL .before 1 assert_equals:
+<img id="item" src="" class=" before" data-expected-width="80" data-expected-height="80">
+height expected 80 but got 100
PASS .after 2
Modified: trunk/LayoutTests/platform/win/TestExpectations (285856 => 285857)
--- trunk/LayoutTests/platform/win/TestExpectations 2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/LayoutTests/platform/win/TestExpectations 2021-11-16 11:41:05 UTC (rev 285857)
@@ -3821,6 +3821,8 @@
webkit.org/b/177216 fast/images/animated-image-mp4.html [ Skip ]
+webkit.org/b/228325 fast/images/exif-orientation-composited.html [ Pass ImageOnlyFailure ]
+
webkit.org/b/177234 http/wpt/resource-timing/rt-cors.html [ Skip ]
webkit.org/b/177234 http/wpt/resource-timing/rt-cors.worker.html [ Skip ]
Modified: trunk/Source/WebCore/ChangeLog (285856 => 285857)
--- trunk/Source/WebCore/ChangeLog 2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/Source/WebCore/ChangeLog 2021-11-16 11:41:05 UTC (rev 285857)
@@ -1,3 +1,28 @@
+2021-11-16 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r280078, r280290 and r282008.
+ https://bugs.webkit.org/show_bug.cgi?id=233184
+
+ Caused a crash in grid
+
+ Reverted changesets:
+
+ "Images as grid items should use the overridingLogicalWidth
+ when defined to compute the logical Height"
+ https://bugs.webkit.org/show_bug.cgi?id=228022
+ https://commits.webkit.org/r280078
+
+ "[css-grid] svg image as grid items should use the overriding
+ logical width/height when defined to compute the logical
+ height/width"
+ https://bugs.webkit.org/show_bug.cgi?id=228105
+ https://commits.webkit.org/r280290
+
+ "REGRESSION(r280078): broke fast/images/exif-orientation-
+ composited.html on windows"
+ https://bugs.webkit.org/show_bug.cgi?id=228325
+ https://commits.webkit.org/r282008
+
2021-11-16 Cathie Chen <[email protected]>
[CSS contain] The size should be updated if layout containment is inside a fit-content parent
Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (285856 => 285857)
--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2021-11-16 11:41:05 UTC (rev 285857)
@@ -1179,15 +1179,12 @@
void RenderGrid::applyStretchAlignmentToChildIfNeeded(RenderBox& child)
{
ASSERT(child.overridingContainingBlockContentLogicalHeight());
- ASSERT(child.overridingContainingBlockContentLogicalWidth());
- // We clear height and width override values because we will decide now whether it's allowed or
+ // We clear height override values because we will decide now whether it's allowed or
// not, evaluating the conditions which might have changed since the old values were set.
child.clearOverridingLogicalHeight();
- child.clearOverridingLogicalWidth();
GridTrackSizingDirection childBlockDirection = GridLayoutFunctions::flowAwareDirectionForChild(*this, child, ForRows);
- GridTrackSizingDirection childInlineDirection = GridLayoutFunctions::flowAwareDirectionForChild(*this, child, ForColumns);
bool blockFlowIsColumnAxis = childBlockDirection == ForRows;
bool allowedToStretchChildBlockSize = blockFlowIsColumnAxis ? allowedToStretchChildAlongColumnAxis(child) : allowedToStretchChildAlongRowAxis(child);
if (allowedToStretchChildBlockSize && !aspectRatioPrefersInline(child, blockFlowIsColumnAxis)) {
@@ -1203,13 +1200,7 @@
child.setLogicalHeight(0_lu);
child.setNeedsLayout(MarkOnlyThis);
}
- } else if (!allowedToStretchChildBlockSize && allowedToStretchChildAlongRowAxis(child)) {
- LayoutUnit stretchedLogicalWidth = availableAlignmentSpaceForChildBeforeStretching(GridLayoutFunctions::overridingContainingBlockContentSizeForChild(child, childInlineDirection).value(), child);
- LayoutUnit desiredLogicalWidth = constrainLogicalWidthInFragmentByMinMax(stretchedLogicalWidth, contentWidth(), *this, nullptr);
- child.setOverridingLogicalWidth(desiredLogicalWidth);
- if (desiredLogicalWidth != child.logicalWidth())
- child.setNeedsLayout(MarkOnlyThis);
- }
+ }
}
// FIXME: This logic is shared by RenderFlexibleBox, so it should be moved to RenderBox.
Modified: trunk/Source/WebCore/rendering/RenderReplaced.cpp (285856 => 285857)
--- trunk/Source/WebCore/rendering/RenderReplaced.cpp 2021-11-16 10:44:32 UTC (rev 285856)
+++ trunk/Source/WebCore/rendering/RenderReplaced.cpp 2021-11-16 11:41:05 UTC (rev 285857)
@@ -553,7 +553,7 @@
// For flex or grid items where the logical height has been overriden then we should use that size to compute the replaced width as long as the flex or
// grid item has an intrinsic size. It is possible (indeed, common) for an SVG graphic to have an intrinsic aspect ratio but not to have an intrinsic
// width or height. There are also elements with intrinsic sizes but without intrinsic ratio (like an iframe).
- if (intrinsicRatio && (isFlexItem() || isGridItem()) && hasOverridingLogicalHeight() && ((hasIntrinsicWidth && hasIntrinsicHeight) || (contentRenderer && contentRenderer->isSVGRoot() && (hasIntrinsicWidth || hasIntrinsicHeight))))
+ if (intrinsicRatio && (isFlexItem() || isGridItem()) && hasOverridingLogicalHeight() && hasIntrinsicWidth && hasIntrinsicHeight)
return computeReplacedLogicalWidthRespectingMinMaxWidth(roundToInt(round(overridingContentLogicalHeight() * intrinsicRatio)), shouldComputePreferred);
// If 'height' and 'width' both have computed values of 'auto' and the element also has an intrinsic width, then that intrinsic width is the used value of 'width'.
@@ -623,7 +623,7 @@
bool hasIntrinsicWidth = constrainedSize.hasIntrinsicWidth || constrainedSize.width() > 0;
// See computeReplacedLogicalHeight() for a similar check for heights.
- if (intrinsicRatio && (isFlexItem() || isGridItem()) && hasOverridingLogicalWidth() && ((hasIntrinsicWidth && hasIntrinsicHeight) || (contentRenderer && contentRenderer->isSVGRoot() && (hasIntrinsicWidth || hasIntrinsicHeight))))
+ if (intrinsicRatio && isFlexItem() && hasOverridingLogicalWidth() && hasIntrinsicHeight && hasIntrinsicWidth)
return computeReplacedLogicalHeightRespectingMinMaxHeight(roundToInt(round(overridingContentLogicalWidth() / intrinsicRatio)));
// If 'height' and 'width' both have computed values of 'auto' and the element also has an intrinsic height, then that intrinsic height is the used value of 'height'.
