Title: [263018] trunk
Revision
263018
Author
[email protected]
Date
2020-06-14 22:56:50 -0700 (Sun, 14 Jun 2020)

Log Message

Unreviewed, reverting r262124.

Twitter videos go blank after exiting fullscreen

Reverted changeset:

"[css-flex] Allow indefinite size flex items to be definite
wrt resolving percentages inside them"
https://bugs.webkit.org/show_bug.cgi?id=212264
https://trac.webkit.org/changeset/262124

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (263017 => 263018)


--- trunk/LayoutTests/ChangeLog	2020-06-15 02:07:08 UTC (rev 263017)
+++ trunk/LayoutTests/ChangeLog	2020-06-15 05:56:50 UTC (rev 263018)
@@ -1,3 +1,16 @@
+2020-06-14  Sergio Villar Senin  <[email protected]>
+
+        Unreviewed, reverting r262124.
+
+        Twitter videos go blank after exiting fullscreen
+
+        Reverted changeset:
+
+        "[css-flex] Allow indefinite size flex items to be definite
+        wrt resolving percentages inside them"
+        https://bugs.webkit.org/show_bug.cgi?id=212264
+        https://trac.webkit.org/changeset/262124
+
 2020-06-14  Sam Weinig  <[email protected]>
 
         [WPT] html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-pluginarray.html fails due to lack of caching of Plugin objects

Modified: trunk/LayoutTests/css3/flexbox/definite-main-size-expected.txt (263017 => 263018)


--- trunk/LayoutTests/css3/flexbox/definite-main-size-expected.txt	2020-06-15 02:07:08 UTC (rev 263017)
+++ trunk/LayoutTests/css3/flexbox/definite-main-size-expected.txt	2020-06-15 05:56:50 UTC (rev 263018)
@@ -9,6 +9,6 @@
 
 Simple case of percentage resolution, columns:
 
-auto flex-basis. This is still definite.
+auto flex-basis, we should ignore the percentage height here:
 
 

Modified: trunk/LayoutTests/css3/flexbox/definite-main-size.html (263017 => 263018)


--- trunk/LayoutTests/css3/flexbox/definite-main-size.html	2020-06-15 02:07:08 UTC (rev 263017)
+++ trunk/LayoutTests/css3/flexbox/definite-main-size.html	2020-06-15 05:56:50 UTC (rev 263018)
@@ -61,10 +61,10 @@
   <div class="rect flex-none"></div>
 </div>
 
-<p>auto flex-basis. This is still definite.</p>
+<p>auto flex-basis, we should ignore the percentage height here:</p>
 <div class="flexbox column" style="height: 300px;">
   <div data-expected-height="50">
-    <div style="height: 50%;" data-expected-height="25">
+    <div style="height: 50%;" data-expected-height="50">
       <div class="rect"></div>
     </div>
   </div>

Modified: trunk/LayoutTests/imported/w3c/ChangeLog (263017 => 263018)


--- trunk/LayoutTests/imported/w3c/ChangeLog	2020-06-15 02:07:08 UTC (rev 263017)
+++ trunk/LayoutTests/imported/w3c/ChangeLog	2020-06-15 05:56:50 UTC (rev 263018)
@@ -1,3 +1,16 @@
+2020-06-14  Sergio Villar Senin  <[email protected]>
+
+        Unreviewed, reverting r262124.
+
+        Twitter videos go blank after exiting fullscreen
+
+        Reverted changeset:
+
+        "[css-flex] Allow indefinite size flex items to be definite
+        wrt resolving percentages inside them"
+        https://bugs.webkit.org/show_bug.cgi?id=212264
+        https://trac.webkit.org/changeset/262124
+
 2020-06-14  Sam Weinig  <[email protected]>
 
         [WPT] html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-pluginarray.html fails due to lack of caching of Plugin objects

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/percentage-heights-003-expected.txt (263017 => 263018)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/percentage-heights-003-expected.txt	2020-06-15 02:07:08 UTC (rev 263017)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/percentage-heights-003-expected.txt	2020-06-15 05:56:50 UTC (rev 263018)
@@ -1,9 +1,30 @@
 
-PASS .flexbox 1 
-PASS .flexbox 2 
+FAIL .flexbox 1 assert_equals: 
+<div class="flexbox column" style="height: 0">
+        <div>
+            <span data-expected-height="100"></span>
+        </div>
+    </div>
+height expected 100 but got 0
+FAIL .flexbox 2 assert_equals: 
+<div class="flexbox column-wrap" style="height: 0">
+       <div>
+            <span data-expected-height="50"></span>
+        </div>
+        <div>
+            <span data-expected-height="50"></span>
+        </div>
+    </div>
+height expected 50 but got 0
 PASS .flexbox 3 
 PASS .flexbox 4 
 PASS .flexbox 5 
 PASS .flexbox 6 
-PASS .flexbox 7 
+FAIL .flexbox 7 assert_equals: 
+<div class="flexbox vert-wm">
+        <div class="horiz-wm">
+            <span data-expected-height="100"></span>
+        </div>
+    </div>
+height expected 100 but got 0
 

Modified: trunk/Source/WebCore/ChangeLog (263017 => 263018)


--- trunk/Source/WebCore/ChangeLog	2020-06-15 02:07:08 UTC (rev 263017)
+++ trunk/Source/WebCore/ChangeLog	2020-06-15 05:56:50 UTC (rev 263018)
@@ -1,3 +1,16 @@
+2020-06-14  Sergio Villar Senin  <[email protected]>
+
+        Unreviewed, reverting r262124.
+
+        Twitter videos go blank after exiting fullscreen
+
+        Reverted changeset:
+
+        "[css-flex] Allow indefinite size flex items to be definite
+        wrt resolving percentages inside them"
+        https://bugs.webkit.org/show_bug.cgi?id=212264
+        https://trac.webkit.org/changeset/262124
+
 2020-06-14  Sam Weinig  <[email protected]>
 
         [WPT] html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-pluginarray.html fails due to lack of caching of Plugin objects

Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (263017 => 263018)


--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp	2020-06-15 02:07:08 UTC (rev 263017)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp	2020-06-15 05:56:50 UTC (rev 263018)
@@ -1156,12 +1156,21 @@
 
 Optional<LayoutUnit> RenderFlexibleBox::mainSizeForPercentageResolution(const RenderBox& child)
 {
-    // This function implements section 9.8. Definite and Indefinite Sizes, case 2) of the flexbox spec.
-    // If the flex container has a definite main size the flex item post-flexing main size is also treated
-    // as definite. We make up a percentage to check whether we have a definite size.
-    if (!mainAxisLengthIsDefinite(child, Length(0, Percent)))
+    // This function implements section 9.8. Definite and Indefinite Sizes, case
+    // 2) of the flexbox spec.
+    // We need to check for the flexbox to have a definite main size, and for the
+    // flex item to have a definite flex basis.
+    const Length& flexBasis = flexBasisForChild(child);
+    if (!mainAxisLengthIsDefinite(child, flexBasis))
         return WTF::nullopt;
-
+    if (!flexBasis.isPercentOrCalculated()) {
+        // If flex basis had a percentage, our size is guaranteed to be definite or
+        // the flex item's size could not be definite. Otherwise, we make up a
+        // percentage to check whether we have a definite size.
+        if (!mainAxisLengthIsDefinite(child, Length(0, Percent)))
+            return WTF::nullopt;
+    }
+    
     if (hasOrthogonalFlow(child))
         return child.hasOverrideContentLogicalHeight() ? Optional<LayoutUnit>(child.overrideContentLogicalHeight()) : WTF::nullopt;
     return child.hasOverrideContentLogicalWidth() ? Optional<LayoutUnit>(child.overrideContentLogicalWidth()) : WTF::nullopt;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to