[AspectRatio] Correctly handle insets for legacy abspos

Given top: 0; bottom: 0; width: auto; aspect-ratio: 1/1;, we should
compute the width from the height.

R=ikilpatrick@chromium.org, mstensho@chromium.org

Bug: 1083010
Change-Id: I2ea7a791f827dc42ca07e0aaa1238584bfc47a32
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2442368
Commit-Queue: Christian Biesinger <cbiesinger@chromium.org>
Auto-Submit: Christian Biesinger <cbiesinger@chromium.org>
Reviewed-by: Morten Stenshorne <mstensho@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812688}

third_party/blink/renderer/core/layout/layout_box.cc

@@ -3836,9 +3836,10 @@ LayoutUnit LayoutBox::ContainerWidthInInlineDirection() const {
 bool LayoutBox::ShouldComputeLogicalWidthFromAspectRatio(
     LayoutUnit* out_logical_height) const {
   NOT_DESTROYED();
-  if (StyleRef().AspectRatio().IsAuto() ||
-      (!StyleRef().LogicalHeight().IsFixed() &&
-       !StyleRef().LogicalHeight().IsPercentOrCalc())) {
+  if (!ShouldComputeLogicalWidthFromAspectRatioAndInsets() &&
+      (StyleRef().AspectRatio().IsAuto() ||
+       (!StyleRef().LogicalHeight().IsFixed() &&
+        !StyleRef().LogicalHeight().IsPercentOrCalc()))) {
     return false;
   }
 

third_party/blink/renderer/core/layout/layout_box.h

@@ -560,12 +560,25 @@ class CORE_EXPORT LayoutBox : public LayoutBoxModelObject {
       LayoutUnit* logical_height = nullptr) const;
   bool ShouldComputeLogicalHeightFromAspectRatio() const {
     NOT_DESTROYED();
+    if (ShouldComputeLogicalWidthFromAspectRatioAndInsets())
+      return false;
     Length h = StyleRef().LogicalHeight();
     return !StyleRef().AspectRatio().IsAuto() &&
            (h.IsAuto() ||
             (!IsOutOfFlowPositioned() && h.IsPercentOrCalc() &&
              ComputePercentageLogicalHeight(h) == kIndefiniteSize));
   }
+  bool ShouldComputeLogicalWidthFromAspectRatioAndInsets() const {
+    NOT_DESTROYED();
+    const ComputedStyle& style = StyleRef();
+    if (style.AspectRatio().IsAuto() || !IsOutOfFlowPositioned())
+      return false;
+    if (style.Width().IsAuto() && style.Height().IsAuto() &&
+        !style.LogicalTop().IsAuto() && !style.LogicalBottom().IsAuto() &&
+        (style.LogicalLeft().IsAuto() || style.LogicalRight().IsAuto()))
+      return true;
+    return false;
+  }
   bool ComputeLogicalWidthFromAspectRatio(LayoutUnit* logical_width) const;
 
   MinMaxSizes ComputeMinMaxLogicalWidthFromAspectRatio() const;

third_party/blink/web_tests/FlagExpectations/disable-layout-ng

@@ -118,7 +118,6 @@ crbug.com/591099 external/wpt/css/css-shapes/shape-outside/supported-shapes/inse
 crbug.com/591099 external/wpt/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-017.html [ Failure ]
 
 ### external/wpt/css/css-sizing/
-crbug.com/1045668 external/wpt/css/css-sizing/aspect-ratio/abspos-004.tentative.html [ Failure ]
 crbug.com/1045668 external/wpt/css/css-sizing/aspect-ratio/abspos-013.tentative.html [ Pass ]
 crbug.com/1045668 external/wpt/css/css-sizing/aspect-ratio/block-aspect-ratio-024.tentative.html [ Failure ]
 crbug.com/1045668 external/wpt/css/css-sizing/aspect-ratio/block-aspect-ratio-028.tentative.html [ Failure ]