Skip to site navigation (Press enter)

[webkit-changes] [274747] branches/safari-612.1.7-branch

rubent_22 Fri, 19 Mar 2021 16:37:17 -0700

Title: [274747] branches/safari-612.1.7-branch

Revision: 274747
Author: [email protected]
Date: 2021-03-19 16:36:22 -0700 (Fri, 19 Mar 2021)

Log Message

Revert r274596. rdar://problem/75635768


Modified Paths

branches/safari-612.1.7-branch/LayoutTests/ChangeLog
branches/safari-612.1.7-branch/LayoutTests/TestExpectations
branches/safari-612.1.7-branch/LayoutTests/imported/w3c/ChangeLog
branches/safari-612.1.7-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-001-expected.txt
branches/safari-612.1.7-branch/LayoutTests/platform/ios-simulator-wk2/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-001-expected.txt
branches/safari-612.1.7-branch/Source/WebCore/ChangeLog
branches/safari-612.1.7-branch/Source/WebCore/rendering/RenderBox.cpp

Diff

Modified: branches/safari-612.1.7-branch/LayoutTests/ChangeLog (274746 => 274747)


--- branches/safari-612.1.7-branch/LayoutTests/ChangeLog	2021-03-19 23:27:45 UTC (rev 274746)
+++ branches/safari-612.1.7-branch/LayoutTests/ChangeLog	2021-03-19 23:36:22 UTC (rev 274747)
@@ -1,3 +1,7 @@
+2021-03-19  Ruben Turcios  <[email protected]>
+
+        Revert r274596. rdar://problem/75635768
+
 2021-03-18  Youenn Fablet  <[email protected]>
 
         Geolocation API does not work in WKWebView with custom URL scheme handler

Modified: branches/safari-612.1.7-branch/LayoutTests/TestExpectations (274746 => 274747)


--- branches/safari-612.1.7-branch/LayoutTests/TestExpectations	2021-03-19 23:27:45 UTC (rev 274746)
+++ branches/safari-612.1.7-branch/LayoutTests/TestExpectations	2021-03-19 23:36:22 UTC (rev 274747)
@@ -1219,6 +1219,7 @@
 webkit.org/b/216145 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-8.html [ ImageOnlyFailure ]
 webkit.org/b/216145 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-9.html [ ImageOnlyFailure ]
 webkit.org/b/216145 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-10.html [ ImageOnlyFailure ]
+webkit.org/b/191627 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-001.html [ Failure ]
 webkit.org/b/149890 fast/css-grid-layout/grid-shorthands-style-format.html [ Failure ]
 webkit.org/b/191507 fast/css-grid-layout/positioned-grid-container-percentage-tracks.html [ Failure ]
 webkit.org/b/191508 fast/css-grid-layout/crash-large-positions.html [ Skip ]

Modified: branches/safari-612.1.7-branch/LayoutTests/imported/w3c/ChangeLog (274746 => 274747)


--- branches/safari-612.1.7-branch/LayoutTests/imported/w3c/ChangeLog	2021-03-19 23:27:45 UTC (rev 274746)
+++ branches/safari-612.1.7-branch/LayoutTests/imported/w3c/ChangeLog	2021-03-19 23:36:22 UTC (rev 274747)
@@ -1,3 +1,7 @@
+2021-03-19  Ruben Turcios  <[email protected]>
+
+        Revert r274596. rdar://problem/75635768
+
 2021-03-18  Cathie Chen  <[email protected]>
 
         Import css/css-contain test from WPT

Modified: branches/safari-612.1.7-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-001-expected.txt (274746 => 274747)


--- branches/safari-612.1.7-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-001-expected.txt	2021-03-19 23:27:45 UTC (rev 274746)
+++ branches/safari-612.1.7-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-001-expected.txt	2021-03-19 23:36:22 UTC (rev 274747)
@@ -24,10 +24,46 @@
 PASS .inline-grid 4
 PASS .inline-grid 5
 PASS .inline-grid 6
-PASS .inline-grid 7
-PASS .inline-grid 8
-PASS .inline-grid 9
-PASS .inline-grid 10
-PASS .inline-grid 11
-PASS .inline-grid 12
+FAIL .inline-grid 7 assert_equals:
+<div class="inline-grid justifyItemsBaseline rows">
+        <div class="firstRowFirstColumn verticalRL width50" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="100"></div>
+        <div class="secondRowFirstColumn verticalRL width200Percent" data-offset-x="0" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div>
+        <div class="firstRowSpanning2AutoColumn verticalRL width25" data-offset-x="50" data-offset-y="0" data-expected-width="25" data-expected-height="200"></div>
+    </div>
+width expected 100 but got 700
+FAIL .inline-grid 8 assert_equals:
+<div class="inline-grid justifyItemsBaseline rows min-content-columns">
+        <div class="firstRowFirstColumn verticalRL" data-offset-x="0" data-offset-y="0" data-expected-width="80" data-expected-height="100">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="secondRowFirstColumn verticalRL width200Percent" data-offset-x="0" data-offset-y="100" data-expected-width="160" data-expected-height="100"></div>
+        <div class="firstRowSpanning2AutoColumn verticalRL width25" data-offset-x="80" data-offset-y="0" data-expected-width="25" data-expected-height="200"></div>
+    </div>
+width expected 160 but got 940
+FAIL .inline-grid 9 assert_equals:
+<div class="inline-grid justifyItemsBaseline rows max-content-columns">
+        <div class="firstRowFirstColumn verticalRL" data-offset-x="0" data-offset-y="0" data-expected-width="80" data-expected-height="100">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="secondRowFirstColumn verticalRL width200Percent" data-offset-x="0" data-offset-y="100" data-expected-width="160" data-expected-height="100"></div>
+        <div class="firstRowSpanning2AutoColumn verticalRL width25" data-offset-x="80" data-offset-y="0" data-expected-width="25" data-expected-height="200"></div>
+    </div>
+width expected 160 but got 940
+FAIL .inline-grid 10 assert_equals:
+<div class="inline-grid justifyItemsBaseline rows fit-content-columns">
+        <div class="firstRowFirstColumn verticalRL" data-offset-x="0" data-offset-y="0" data-expected-width="80" data-expected-height="100">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="secondRowFirstColumn verticalRL width200Percent" data-offset-x="0" data-offset-y="100" data-expected-width="160" data-expected-height="100"></div>
+        <div class="firstRowSpanning2AutoColumn verticalRL width25" data-offset-x="80" data-offset-y="0" data-expected-width="25" data-expected-height="200"></div>
+    </div>
+width expected 160 but got 940
+FAIL .inline-grid 11 assert_equals:
+<div class="inline-grid justifyItemsBaseline rows flex-columns">
+        <div class="firstRowFirstColumn verticalRL width50" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="100"></div>
+        <div class="secondRowFirstColumn verticalRL width200Percent" data-offset-x="0" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div>
+        <div class="firstRowSpanning2AutoColumn verticalRL width25" data-offset-x="50" data-offset-y="0" data-expected-width="25" data-expected-height="200"></div>
+    </div>
+width expected 100 but got 700
+FAIL .inline-grid 12 assert_equals:
+<div class="inline-grid justifyItemsBaseline rows max-flex-columns">
+        <div class="firstRowFirstColumn verticalRL width50" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="100"></div>
+        <div class="secondRowFirstColumn verticalRL width200Percent" data-offset-x="-50" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div>
+        <div class="firstRowSpanning2AutoColumn verticalRL width25" data-offset-x="50" data-offset-y="0" data-expected-width="25" data-expected-height="200"></div>
+    </div>
+offsetLeft expected 0 but got 100

Modified: branches/safari-612.1.7-branch/LayoutTests/platform/ios-simulator-wk2/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-001-expected.txt (274746 => 274747)


--- branches/safari-612.1.7-branch/LayoutTests/platform/ios-simulator-wk2/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-001-expected.txt	2021-03-19 23:27:45 UTC (rev 274746)
+++ branches/safari-612.1.7-branch/LayoutTests/platform/ios-simulator-wk2/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-001-expected.txt	2021-03-19 23:36:22 UTC (rev 274747)
@@ -18,39 +18,28 @@
  flex max-function columns - items with relative width
 baseline is not applied initially, but orthogonal items force repeating the track sizing and height is not indefinite in that phase.
 
-PASS .inline-grid 1
+FAIL .inline-grid 1 assert_equals:
+<div class="inline-grid justifyItemsBaseline rows max-flex-columns">
+        <div class="firstRowFirstColumn verticalRL width50" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="100"></div>
+        <div class="secondRowFirstColumn verticalRL width200Percent" data-offset-x="-50" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div>
+        <div class="firstRowSpanning2AutoColumn verticalRL width25" data-offset-x="50" data-offset-y="0" data-expected-width="25" data-expected-height="200"></div>
+    </div>
+offsetLeft expected -50 but got 0
 FAIL .inline-grid 2 assert_equals:
-<div class="inline-grid alignItemsBaseline columns min-content-rows">
-        <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="80">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
-        <div class="firstRowSecondColumn height200Percent" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="160"></div>
-        <div class="autoRowAutoColumnSpanning2 height25" data-offset-x="0" data-offset-y="80" data-expected-width="200" data-expected-height="25"></div>
+<div class="inline-grid justifyItemsBaseline rows flex-columns">
+        <div class="firstRowFirstColumn verticalRL width50" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="100"></div>
+        <div class="secondRowFirstColumn verticalRL width200Percent" data-offset-x="0" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div>
+        <div class="firstRowSpanning2AutoColumn verticalRL width25" data-offset-x="50" data-offset-y="0" data-expected-width="25" data-expected-height="200"></div>
     </div>
-height expected 80 but got 85
+width expected 100 but got 300
 FAIL .inline-grid 3 assert_equals:
-<div class="inline-grid alignItemsBaseline columns max-content-rows">
-        <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="80">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
-        <div class="firstRowSecondColumn height200Percent" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="160"></div>
-        <div class="autoRowAutoColumnSpanning2 height25" data-offset-x="0" data-offset-y="80" data-expected-width="200" data-expected-height="25"></div>
-    </div>
-height expected 80 but got 85
-FAIL .inline-grid 4 assert_equals:
-<div class="inline-grid alignItemsBaseline columns fit-content-rows">
-        <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="80">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
-        <div class="firstRowSecondColumn height200Percent" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="160"></div>
-        <div class="autoRowAutoColumnSpanning2 height25" data-offset-x="0" data-offset-y="80" data-expected-width="200" data-expected-height="25"></div>
-    </div>
-height expected 80 but got 85
-PASS .inline-grid 5
-PASS .inline-grid 6
-PASS .inline-grid 7
-FAIL .inline-grid 8 assert_equals:
-<div class="inline-grid justifyItemsBaseline rows min-content-columns">
+<div class="inline-grid justifyItemsBaseline rows fit-content-columns">
         <div class="firstRowFirstColumn verticalRL" data-offset-x="0" data-offset-y="0" data-expected-width="80" data-expected-height="100">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
         <div class="secondRowFirstColumn verticalRL width200Percent" data-offset-x="0" data-offset-y="100" data-expected-width="160" data-expected-height="100"></div>
         <div class="firstRowSpanning2AutoColumn verticalRL width25" data-offset-x="80" data-offset-y="0" data-expected-width="25" data-expected-height="200"></div>
     </div>
 width expected 80 but got 85
-FAIL .inline-grid 9 assert_equals:
+FAIL .inline-grid 4 assert_equals:
 <div class="inline-grid justifyItemsBaseline rows max-content-columns">
         <div class="firstRowFirstColumn verticalRL" data-offset-x="0" data-offset-y="0" data-expected-width="80" data-expected-height="100">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
         <div class="secondRowFirstColumn verticalRL width200Percent" data-offset-x="0" data-offset-y="100" data-expected-width="160" data-expected-height="100"></div>
@@ -57,13 +46,42 @@
         <div class="firstRowSpanning2AutoColumn verticalRL width25" data-offset-x="80" data-offset-y="0" data-expected-width="25" data-expected-height="200"></div>
     </div>
 width expected 80 but got 85
-FAIL .inline-grid 10 assert_equals:
-<div class="inline-grid justifyItemsBaseline rows fit-content-columns">
+FAIL .inline-grid 5 assert_equals:
+<div class="inline-grid justifyItemsBaseline rows min-content-columns">
         <div class="firstRowFirstColumn verticalRL" data-offset-x="0" data-offset-y="0" data-expected-width="80" data-expected-height="100">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
         <div class="secondRowFirstColumn verticalRL width200Percent" data-offset-x="0" data-offset-y="100" data-expected-width="160" data-expected-height="100"></div>
         <div class="firstRowSpanning2AutoColumn verticalRL width25" data-offset-x="80" data-offset-y="0" data-expected-width="25" data-expected-height="200"></div>
     </div>
 width expected 80 but got 85
-PASS .inline-grid 11
+FAIL .inline-grid 6 assert_equals:
+<div class="inline-grid justifyItemsBaseline rows">
+        <div class="firstRowFirstColumn verticalRL width50" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="100"></div>
+        <div class="secondRowFirstColumn verticalRL width200Percent" data-offset-x="0" data-offset-y="100" data-expected-width="100" data-expected-height="100"></div>
+        <div class="firstRowSpanning2AutoColumn verticalRL width25" data-offset-x="50" data-offset-y="0" data-expected-width="25" data-expected-height="200"></div>
+    </div>
+width expected 100 but got 300
+PASS .inline-grid 7
+PASS .inline-grid 8
+FAIL .inline-grid 9 assert_equals:
+<div class="inline-grid alignItemsBaseline columns fit-content-rows">
+        <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="80">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="firstRowSecondColumn height200Percent" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="160"></div>
+        <div class="autoRowAutoColumnSpanning2 height25" data-offset-x="0" data-offset-y="80" data-expected-width="200" data-expected-height="25"></div>
+    </div>
+height expected 80 but got 85
+FAIL .inline-grid 10 assert_equals:
+<div class="inline-grid alignItemsBaseline columns max-content-rows">
+        <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="80">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="firstRowSecondColumn height200Percent" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="160"></div>
+        <div class="autoRowAutoColumnSpanning2 height25" data-offset-x="0" data-offset-y="80" data-expected-width="200" data-expected-height="25"></div>
+    </div>
+height expected 80 but got 85
+FAIL .inline-grid 11 assert_equals:
+<div class="inline-grid alignItemsBaseline columns min-content-rows">
+        <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="80">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="firstRowSecondColumn height200Percent" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="160"></div>
+        <div class="autoRowAutoColumnSpanning2 height25" data-offset-x="0" data-offset-y="80" data-expected-width="200" data-expected-height="25"></div>
+    </div>
+height expected 80 but got 85
 PASS .inline-grid 12

Modified: branches/safari-612.1.7-branch/Source/WebCore/ChangeLog (274746 => 274747)


--- branches/safari-612.1.7-branch/Source/WebCore/ChangeLog	2021-03-19 23:27:45 UTC (rev 274746)
+++ branches/safari-612.1.7-branch/Source/WebCore/ChangeLog	2021-03-19 23:36:22 UTC (rev 274747)
@@ -1,3 +1,7 @@
+2021-03-19  Ruben Turcios  <[email protected]>
+
+        Revert r274596. rdar://problem/75635768
+
 2021-03-18  Russell Epstein  <[email protected]>
 
         Cherry-pick r274667. Unreviewed build fix.

Modified: branches/safari-612.1.7-branch/Source/WebCore/rendering/RenderBox.cpp (274746 => 274747)


--- branches/safari-612.1.7-branch/Source/WebCore/rendering/RenderBox.cpp	2021-03-19 23:27:45 UTC (rev 274746)
+++ branches/safari-612.1.7-branch/Source/WebCore/rendering/RenderBox.cpp	2021-03-19 23:36:22 UTC (rev 274747)
@@ -2044,8 +2044,10 @@
 
 LayoutUnit RenderBox::containingBlockLogicalWidthForContent() const
 {
-    if (hasOverridingContainingBlockContentLogicalWidth())
-        return overridingContainingBlockContentLogicalWidth().valueOr(0_lu);
+    if (hasOverridingContainingBlockContentLogicalWidth()) {
+        if (auto width = overridingContainingBlockContentLogicalWidth())
+            return width.value();
+    }
 
     if (RenderBlock* cb = containingBlock())
         return cb->availableLogicalWidth();
@@ -2055,9 +2057,8 @@
 LayoutUnit RenderBox::containingBlockLogicalHeightForContent(AvailableLogicalHeightType heightType) const
 {
     if (hasOverridingContainingBlockContentLogicalHeight()) {
-        // FIXME: Containing block for a grid item is the grid area it's located in. We need to return whatever
-        // height value we get from overridingContainingBlockContentLogicalHeight() here, including WTF::nullopt.
-        return overridingContainingBlockContentLogicalHeight().valueOr(0_lu);
+        if (auto height = overridingContainingBlockContentLogicalHeight())
+            return height.value();
     }
 
     if (RenderBlock* cb = containingBlock())

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes