[css-grid] Check if baseline alignment affects grid areas sizing

third_party/WebKit/Source/core/layout/LayoutGrid.cpp

 /*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 201 matching lines @@
   // intrinsic width may also affect the extra Track Sizing algorithm cycles we
   // are about to execute.
   // https://crbug.com/704713
   // https://github.com/w3c/csswg-drafts/issues/1039
 
   // Hence we need to repeat computeUsedBreadthOfGridTracks for both, columns
   // and rows, to determine the final values.
   ComputeTrackSizesForDefiniteSize(kForColumns, available_space_for_columns);
   ComputeTrackSizesForDefiniteSize(kForRows, available_space_for_rows);
 
-  if (baseline_affect_intrinsic_height) {
+  if (baseline_affect_intrinsic_height &&
+      StyleRef().LogicalHeight().IsIntrinsicOrAuto()) {
     SetLogicalHeight(ComputeTrackBasedLogicalHeight() +
                      BorderAndPaddingLogicalHeight() +
                      ScrollbarLogicalHeight());
   }
 }
 
 void LayoutGrid::UpdateBlockLayout(bool relayout_children) {
   DCHECK(NeedsLayout());
 
   // We cannot perform a simplifiedLayout() on a dirty grid that
@@ skipping 1623 matching lines @@
   return child.MarginLogicalWidth() + child.LogicalWidth() - ascent;
 }
 
 bool LayoutGrid::IsBaselineContextComputed(GridAxis baseline_axis) const {
   return baseline_axis == kGridColumnAxis
              ? !row_axis_alignment_context_.IsEmpty()
              : !col_axis_alignment_context_.IsEmpty();
 }
 
 bool LayoutGrid::BaselineMayAffectIntrinsicWidth() const {
-  if (!StyleRef().LogicalWidth().IsIntrinsicOrAuto())
-    return false;
   for (const auto& context : col_axis_alignment_context_) {
+    auto track_size =
+        track_sizing_algorithm_.GetGridTrackSize(kForColumns, context.key);
+    if (!track_size.IsContentSized())

[Manuel Rego, 2017/05/11 14:10:08]

I'm not sure if the condition should be this or if we should
include flexible sizes too.

+      continue;
     for (const auto& group : context.value->SharedGroups()) {
-      if (group.size() > 1)
+      auto track_size =
+          track_sizing_algorithm_.Tracks(kForColumns)[context.key].BaseSize();
+      if ((group.size() > 1) &&
+          (group.MaxAscent() + group.MaxDescent() > track_size))
         return true;
     }
   }
   return false;
 }
 
 bool LayoutGrid::BaselineMayAffectIntrinsicHeight() const {

[Manuel Rego, 2017/05/11 14:10:08]

Nit: These 2 methods look very similar, could we just have one
that receives the direction. Probably to be done in a follow-up patch
(but please add a TODO if it makes sense to you).

[jfernandez, 2017/05/11 21:51:30]

Acknowledged.

-  if (!StyleRef().LogicalHeight().IsIntrinsicOrAuto())
-    return false;
   for (const auto& context : row_axis_alignment_context_) {
+    auto track_size =
+        track_sizing_algorithm_.GetGridTrackSize(kForRows, context.key);
+    if (!track_size.IsContentSized())

[Manuel Rego, 2017/05/11 14:10:08]

Ditto.

[jfernandez, 2017/05/11 21:51:30]

Acknowledged.

[Manuel Rego, 2017/05/16 10:29:39]

This is not modified yet.

+      continue;
     for (const auto& group : context.value->SharedGroups()) {
-      if (group.size() > 1)
+      auto track_size =
+          track_sizing_algorithm_.Tracks(kForRows)[context.key].BaseSize();
+      if ((group.size() > 1) &&
+          (group.MaxAscent() + group.MaxDescent() > track_size))
         return true;
     }
   }
   return false;
 }
 
 void LayoutGrid::ComputeBaselineAlignmentContext() {
   for (auto* child = FirstInFlowChildBox(); child;
        child = child->NextInFlowSiblingBox()) {
     UpdateBaselineAlignmentContextIfNeeded(*child, kGridRowAxis);
@@ skipping 498 matching lines @@
   if (direction == kForRows)
     return grid.NumTracks(kForRows);
 
   return grid.NumTracks(kForRows)
              ? grid.NumTracks(kForColumns)
              : GridPositionsResolver::ExplicitGridColumnCount(
                    StyleRef(), grid.AutoRepeatTracks(kForColumns));
 }
 
 }  // namespace blink