Diff
Modified: branches/safari-613-branch/LayoutTests/ChangeLog (291924 => 291925)
--- branches/safari-613-branch/LayoutTests/ChangeLog 2022-03-26 01:51:57 UTC (rev 291924)
+++ branches/safari-613-branch/LayoutTests/ChangeLog 2022-03-26 01:52:03 UTC (rev 291925)
@@ -1,5 +1,9 @@
2022-03-23 Alan Coon <[email protected]>
+ Revert r285998. rdar://problem/85612240
+
+2022-03-23 Alan Coon <[email protected]>
+
Cherry-pick r290985. rdar://problem/78421282
Add a preference to mute video capture in case audio capture gets interrupted
Modified: branches/safari-613-branch/LayoutTests/TestExpectations (291924 => 291925)
--- branches/safari-613-branch/LayoutTests/TestExpectations 2022-03-26 01:51:57 UTC (rev 291924)
+++ branches/safari-613-branch/LayoutTests/TestExpectations 2022-03-26 01:52:03 UTC (rev 291925)
@@ -1354,6 +1354,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 ]
@@ -4250,6 +4253,8 @@
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-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: branches/safari-613-branch/LayoutTests/imported/w3c/ChangeLog (291924 => 291925)
--- branches/safari-613-branch/LayoutTests/imported/w3c/ChangeLog 2022-03-26 01:51:57 UTC (rev 291924)
+++ branches/safari-613-branch/LayoutTests/imported/w3c/ChangeLog 2022-03-26 01:52:03 UTC (rev 291925)
@@ -1,5 +1,9 @@
2022-03-23 Alan Coon <[email protected]>
+ Revert r285998. rdar://problem/85612240
+
+2022-03-23 Alan Coon <[email protected]>
+
Cherry-pick r290564. rdar://problem/89524668
Force -webkit-user-modify used style to readonly for inert nodes
Modified: branches/safari-613-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-029-expected.txt (291924 => 291925)
--- branches/safari-613-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-029-expected.txt 2022-03-26 01:51:57 UTC (rev 291924)
+++ branches/safari-613-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-029-expected.txt 2022-03-26 01:52:03 UTC (rev 291925)
@@ -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: branches/safari-613-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-030-expected.txt (291924 => 291925)
--- branches/safari-613-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-030-expected.txt 2022-03-26 01:51:57 UTC (rev 291924)
+++ branches/safari-613-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-030-expected.txt 2022-03-26 01:52:03 UTC (rev 291925)
@@ -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: branches/safari-613-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-031-expected.txt (291924 => 291925)
--- branches/safari-613-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-031-expected.txt 2022-03-26 01:51:57 UTC (rev 291924)
+++ branches/safari-613-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-031-expected.txt 2022-03-26 01:52:03 UTC (rev 291925)
@@ -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: branches/safari-613-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-035-expected.txt (291924 => 291925)
--- branches/safari-613-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-035-expected.txt 2022-03-26 01:51:57 UTC (rev 291924)
+++ branches/safari-613-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-035-expected.txt 2022-03-26 01:52:03 UTC (rev 291925)
@@ -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: branches/safari-613-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-036-expected.txt (291924 => 291925)
--- branches/safari-613-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-036-expected.txt 2022-03-26 01:51:57 UTC (rev 291924)
+++ branches/safari-613-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-036-expected.txt 2022-03-26 01:52:03 UTC (rev 291925)
@@ -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: branches/safari-613-branch/LayoutTests/platform/win/TestExpectations (291924 => 291925)
--- branches/safari-613-branch/LayoutTests/platform/win/TestExpectations 2022-03-26 01:51:57 UTC (rev 291924)
+++ branches/safari-613-branch/LayoutTests/platform/win/TestExpectations 2022-03-26 01:52:03 UTC (rev 291925)
@@ -3835,6 +3835,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: branches/safari-613-branch/Source/WebCore/ChangeLog (291924 => 291925)
--- branches/safari-613-branch/Source/WebCore/ChangeLog 2022-03-26 01:51:57 UTC (rev 291924)
+++ branches/safari-613-branch/Source/WebCore/ChangeLog 2022-03-26 01:52:03 UTC (rev 291925)
@@ -1,5 +1,9 @@
2022-03-23 Alan Coon <[email protected]>
+ Revert r285998. rdar://problem/85612240
+
+2022-03-23 Alan Coon <[email protected]>
+
Cherry-pick r290985. rdar://problem/78421282
Add a preference to mute video capture in case audio capture gets interrupted
Modified: branches/safari-613-branch/Source/WebCore/rendering/RenderGrid.cpp (291924 => 291925)
--- branches/safari-613-branch/Source/WebCore/rendering/RenderGrid.cpp 2022-03-26 01:51:57 UTC (rev 291924)
+++ branches/safari-613-branch/Source/WebCore/rendering/RenderGrid.cpp 2022-03-26 01:52:03 UTC (rev 291925)
@@ -1206,15 +1206,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)) {
@@ -1230,13 +1227,7 @@
child.setLogicalHeight(0_lu);
child.setNeedsLayout(MarkOnlyThis);
}
- } else if (!allowedToStretchChildBlockSize && allowedToStretchChildAlongRowAxis(child)) {
- LayoutUnit stretchedLogicalWidth = availableAlignmentSpaceForChildBeforeStretching(GridLayoutFunctions::overridingContainingBlockContentSizeForChild(child, childInlineDirection).value(), child);
- LayoutUnit desiredLogicalWidth = child.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: branches/safari-613-branch/Source/WebCore/rendering/RenderReplaced.cpp (291924 => 291925)
--- branches/safari-613-branch/Source/WebCore/rendering/RenderReplaced.cpp 2022-03-26 01:51:57 UTC (rev 291924)
+++ branches/safari-613-branch/Source/WebCore/rendering/RenderReplaced.cpp 2022-03-26 01:52:03 UTC (rev 291925)
@@ -640,7 +640,7 @@
bool hasIntrinsicWidth = constrainedSize.hasIntrinsicWidth || constrainedSize.width() > 0;
// See computeReplacedLogicalHeight() for a similar check for heights.
- if (intrinsicRatio && (isFlexItem() || isGridItem()) && hasOverridingLogicalWidth() && hasIntrinsicSize(contentRenderer, hasIntrinsicWidth, hasIntrinsicHeight))
+ if (intrinsicRatio && isFlexItem() && hasOverridingLogicalWidth() && hasIntrinsicSize(contentRenderer, hasIntrinsicWidth, hasIntrinsicHeight))
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'.
