Bug 1234311 part 1 - [css-grid][css-grid-2] Simplify and improve calculation of 'grid-template-rows/columns' resolved value when the element has no box. r=dholbert

Differential Revision: https://phabricator.services.mozilla.com/D49026

--HG--
extra : moz-landing-system : lando

layout/style/nsComputedDOMStyle.cpp

@@ -1547,7 +1547,7 @@ already_AddRefed<nsROCSSPrimitiveValue> nsComputedDOMStyle::GetGridTrackSize(
 
 already_AddRefed<CSSValue> nsComputedDOMStyle::GetGridTemplateColumnsRows(
     const StyleGridTemplateComponent& aTrackList,
-    const ComputedGridTrackInfo* aTrackInfo) {
+    const ComputedGridTrackInfo& aTrackInfo) {
   if (aTrackList.IsSubgrid()) {
     // XXX TODO: add support for repeat(auto-fill) for 'subgrid' (bug 1234311)
     RefPtr<nsDOMCSSValueList> valueList = GetROCSSValueList(false);
@@ -1575,9 +1575,8 @@ already_AddRefed<CSSValue> nsComputedDOMStyle::GetGridTemplateColumnsRows(
     }
     return valueList.forget();
   }
-  RefPtr<nsDOMCSSValueList> valueList = GetROCSSValueList(false);
+
-  if (aTrackInfo) {
+  uint32_t numSizes = aTrackInfo.mSizes.Length();
-    uint32_t numSizes = aTrackInfo->mSizes.Length();
   if (!numSizes && !aTrackList.HasRepeatAuto()) {
     RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;
     val->SetIdent(eCSSKeyword_none);
@@ -1589,10 +1588,11 @@ already_AddRefed<CSSValue> nsComputedDOMStyle::GetGridTemplateColumnsRows(
   // repeat(<positive-integer>, Npx) here for consecutive tracks with the same
   // size, but that doesn't seem worth doing since even for repeat(auto-*)
   // the resolved size might differ for the repeated tracks.
-    const nsTArray<nscoord>& trackSizes = aTrackInfo->mSizes;
+  RefPtr<nsDOMCSSValueList> valueList = GetROCSSValueList(false);
-    const uint32_t numExplicitTracks = aTrackInfo->mNumExplicitTracks;
+  const nsTArray<nscoord>& trackSizes = aTrackInfo.mSizes;
+  const uint32_t numExplicitTracks = aTrackInfo.mNumExplicitTracks;
   const uint32_t numLeadingImplicitTracks =
-        aTrackInfo->mNumLeadingImplicitTracks;
+      aTrackInfo.mNumLeadingImplicitTracks;
   MOZ_ASSERT(numSizes >= numLeadingImplicitTracks + numExplicitTracks);
 
   // Add any leading implicit tracks.
@@ -1609,8 +1609,8 @@ already_AddRefed<CSSValue> nsComputedDOMStyle::GetGridTemplateColumnsRows(
     if (aTrackList.HasRepeatAuto()) {
       // offsetToLastRepeat is -1 if all repeat(auto-fit) tracks are empty
       offsetToLastRepeat =
-            numExplicitTracks + 1 - aTrackInfo->mResolvedLineNames.Length();
+          numExplicitTracks + 1 - aTrackInfo.mResolvedLineNames.Length();
-        endOfRepeat = aTrackInfo->mRepeatFirstTrack + offsetToLastRepeat + 1;
+      endOfRepeat = aTrackInfo.mRepeatFirstTrack + offsetToLastRepeat + 1;
     }
 
     auto* autoRepeatValue = aTrackList.GetRepeatAutoValue();
@@ -1621,16 +1621,15 @@ already_AddRefed<CSSValue> nsComputedDOMStyle::GetGridTemplateColumnsRows(
         autoRepeatValue ? autoRepeatValue->line_names.AsSpan()[1].AsSpan()
                         : Span<StyleCustomIdent>();
     uint32_t repeatIndex = 0;
-      uint32_t numRepeatTracks = aTrackInfo->mRemovedRepeatTracks.Length();
+    uint32_t numRepeatTracks = aTrackInfo.mRemovedRepeatTracks.Length();
     enum LinePlacement { LinesPrecede, LinesFollow, LinesBetween };
-      auto AppendRemovedAutoFits = [aTrackInfo, &valueList, aTrackList,
+    auto AppendRemovedAutoFits =
-                                    beforeAutoRepeat, afterAutoRepeat,
+        [&aTrackInfo, &valueList, aTrackList, beforeAutoRepeat, afterAutoRepeat,
-                                    &repeatIndex,
+         &repeatIndex, numRepeatTracks](LinePlacement aPlacement) {
-                                    numRepeatTracks](LinePlacement aPlacement) {
           // Add in removed auto-fit tracks and lines here, if necessary
           bool atLeastOneTrackReported = false;
           while (repeatIndex < numRepeatTracks &&
-               aTrackInfo->mRemovedRepeatTracks[repeatIndex]) {
+                 aTrackInfo.mRemovedRepeatTracks[repeatIndex]) {
             if ((aPlacement == LinesPrecede) ||
                 ((aPlacement == LinesBetween) && atLeastOneTrackReported)) {
               // Precede it with the lines between repeats.
@@ -1654,9 +1653,9 @@ already_AddRefed<CSSValue> nsComputedDOMStyle::GetGridTemplateColumnsRows(
 
     for (uint32_t i = 0;; i++) {
       if (aTrackList.HasRepeatAuto()) {
-          if (i == aTrackInfo->mRepeatFirstTrack) {
+        if (i == aTrackInfo.mRepeatFirstTrack) {
           const nsTArray<StyleCustomIdent>& lineNames =
-                aTrackInfo->mResolvedLineNames[i];
+              aTrackInfo.mResolvedLineNames[i];
           if (i == endOfRepeat) {
             // All auto-fit tracks are empty, but we report them anyway.
             AppendGridLineNames(valueList, lineNames);
@@ -1664,7 +1663,7 @@ already_AddRefed<CSSValue> nsComputedDOMStyle::GetGridTemplateColumnsRows(
             AppendRemovedAutoFits(LinesBetween);
 
             AppendGridLineNames(valueList,
-                                  aTrackInfo->mResolvedLineNames[i + 1]);
+                                aTrackInfo.mResolvedLineNames[i + 1]);
           } else {
             AppendGridLineNames(valueList, lineNames);
             AppendRemovedAutoFits(LinesFollow);
@@ -1674,21 +1673,20 @@ already_AddRefed<CSSValue> nsComputedDOMStyle::GetGridTemplateColumnsRows(
           AppendRemovedAutoFits(LinesPrecede);
 
           const nsTArray<StyleCustomIdent>& lineNames =
-                aTrackInfo
+              aTrackInfo.mResolvedLineNames[aTrackInfo.mRepeatFirstTrack + 1];
-                    ->mResolvedLineNames[aTrackInfo->mRepeatFirstTrack + 1];
           AppendGridLineNames(valueList, lineNames);
-          } else if (i > aTrackInfo->mRepeatFirstTrack && i < endOfRepeat) {
+        } else if (i > aTrackInfo.mRepeatFirstTrack && i < endOfRepeat) {
           AppendGridLineNames(valueList, afterAutoRepeat, beforeAutoRepeat);
           AppendRemovedAutoFits(LinesFollow);
         } else {
           uint32_t j = i > endOfRepeat ? i - offsetToLastRepeat : i;
           const nsTArray<StyleCustomIdent>& lineNames =
-                aTrackInfo->mResolvedLineNames[j];
+              aTrackInfo.mResolvedLineNames[j];
           AppendGridLineNames(valueList, lineNames);
         }
       } else {
         const nsTArray<StyleCustomIdent>& lineNames =
-              aTrackInfo->mResolvedLineNames[i];
+            aTrackInfo.mResolvedLineNames[i];
         AppendGridLineNames(valueList, lineNames);
       }
       if (i == numExplicitTracks) {
@@ -1701,109 +1699,53 @@ already_AddRefed<CSSValue> nsComputedDOMStyle::GetGridTemplateColumnsRows(
   }
 
   // Add any trailing implicit tracks.
-    for (uint32_t i = numLeadingImplicitTracks + numExplicitTracks;
+  for (uint32_t i = numLeadingImplicitTracks + numExplicitTracks; i < numSizes;
-         i < numSizes; ++i) {
+       ++i) {
     RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;
     val->SetAppUnits(trackSizes[i]);
     valueList->AppendCSSValue(val.forget());
   }
-  } else {
-    if (aTrackList.IsNone()) {
-      RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;
-      val->SetIdent(eCSSKeyword_none);
-      return val.forget();
-    }
-    // We don't have a frame.  So, we'll just return a serialization of
-    // the tracks from the style (without resolved sizes).
-    auto& trackList = *aTrackList.AsTrackList();
-    auto nameLists = trackList.line_names.AsSpan();
-    auto values = trackList.values.AsSpan();
-    uint32_t numSizes = values.Length();
-    for (uint32_t i = 0;; i++) {
-      auto names = nameLists[i].AsSpan();
-      if (!names.IsEmpty()) {
-        AppendGridLineNames(valueList, names);
-      }
-      if (i == numSizes) {
-        break;
-      }
-      auto& value = values[i];
-      if (value.IsTrackRepeat()) {
-        auto& repeat = value.AsTrackRepeat();
-        nsAutoString string;
-        string.AppendLiteral("repeat(");
-        if (repeat.count.IsNumber()) {
-          nsStyleUtil::AppendCSSNumber(repeat.count.AsNumber(), string);
-        } else if (repeat.count.IsAutoFit()) {
-          string.AppendLiteral("auto-fit");
-        } else {
-          MOZ_ASSERT(repeat.count.IsAutoFill());
-          string.AppendLiteral("auto-fill");
-        }
-        string.AppendLiteral(",");
-
-        auto repeat_names = repeat.line_names.AsSpan();
-        auto repeat_sizes = repeat.track_sizes.AsSpan();
-        MOZ_ASSERT(repeat_names.Length() == repeat_sizes.Length() ||
-                   repeat_names.Length() == repeat_sizes.Length() + 1);
-        for (auto i : IntegerRange(repeat_sizes.Length())) {
-          auto names = repeat_names[i];
-          if (!names.IsEmpty()) {
-            string.Append(' ');
-            AppendGridLineNames(string, names.AsSpan(), Brackets::Yes);
-          }
-          string.Append(' ');
-          RefPtr<nsROCSSPrimitiveValue> size =
-              GetGridTrackSize(repeat_sizes[i]);
-          nsAutoString tmp;
-          size->GetCssText(tmp);
-          string.Append(tmp);
-        }
-        if (repeat_names.Length() == repeat_sizes.Length() + 1) {
-          auto lastList = repeat_names[repeat_sizes.Length()].AsSpan();
-          if (!lastList.IsEmpty()) {
-            string.Append(' ');
-            AppendGridLineNames(string, lastList, Brackets::Yes);
-          }
-        }
-        string.Append(')');
-        RefPtr<nsROCSSPrimitiveValue> value = new nsROCSSPrimitiveValue;
-        value->SetString(string);
-        valueList->AppendCSSValue(value.forget());
-      } else {
-        valueList->AppendCSSValue(GetGridTrackSize(value.AsTrackSize()));
-      }
-    }
-  }
 
   return valueList.forget();
 }
 
 already_AddRefed<CSSValue> nsComputedDOMStyle::DoGetGridTemplateColumns() {
-  const ComputedGridTrackInfo* info = nullptr;
-
   nsGridContainerFrame* gridFrame =
       nsGridContainerFrame::GetGridFrameWithComputedInfo(mInnerFrame);
-
+  if (!gridFrame) {
-  if (gridFrame) {
+    // The element doesn't have a box - return the computed value.
-    info = gridFrame->GetComputedTemplateColumns();
+    // https://drafts.csswg.org/css-grid/#resolved-track-list
+    nsAutoString string;
+    Servo_GetPropertyValue(mComputedStyle, eCSSProperty_grid_template_columns,
+                           &string);
+    RefPtr<nsROCSSPrimitiveValue> value = new nsROCSSPrimitiveValue;
+    value->SetString(string);
+    return value.forget();
   }
 
+  // GetGridFrameWithComputedInfo() above ensures that this returns non-null:
+  const ComputedGridTrackInfo* info = gridFrame->GetComputedTemplateColumns();
   return GetGridTemplateColumnsRows(StylePosition()->mGridTemplateColumns,
-                                    info);
+                                    *info);
 }
 
 already_AddRefed<CSSValue> nsComputedDOMStyle::DoGetGridTemplateRows() {
-  const ComputedGridTrackInfo* info = nullptr;
-
   nsGridContainerFrame* gridFrame =
       nsGridContainerFrame::GetGridFrameWithComputedInfo(mInnerFrame);
-
+  if (!gridFrame) {
-  if (gridFrame) {
+    // The element doesn't have a box - return the computed value.
-    info = gridFrame->GetComputedTemplateRows();
+    // https://drafts.csswg.org/css-grid/#resolved-track-list
+    nsAutoString string;
+    Servo_GetPropertyValue(mComputedStyle, eCSSProperty_grid_template_rows,
+                           &string);
+    RefPtr<nsROCSSPrimitiveValue> value = new nsROCSSPrimitiveValue;
+    value->SetString(string);
+    return value.forget();
   }
 
-  return GetGridTemplateColumnsRows(StylePosition()->mGridTemplateRows, info);
+  // GetGridFrameWithComputedInfo() above ensures that this returns non-null:
+  const ComputedGridTrackInfo* info = gridFrame->GetComputedTemplateRows();
+  return GetGridTemplateColumnsRows(StylePosition()->mGridTemplateRows, *info);
 }
 
 already_AddRefed<CSSValue> nsComputedDOMStyle::DoGetPaddingTop() {

layout/style/nsComputedDOMStyle.h

@@ -197,7 +197,7 @@ class nsComputedDOMStyle final : public nsDOMCSSDeclaration,
                               const mozilla::StyleTrackBreadth&);
   already_AddRefed<CSSValue> GetGridTemplateColumnsRows(
       const mozilla::StyleGridTemplateComponent& aTrackList,
-      const mozilla::ComputedGridTrackInfo* aTrackInfo);
+      const mozilla::ComputedGridTrackInfo& aTrackInfo);
 
   bool GetLineHeightCoord(nscoord& aCoord);