[css-grid] Performance optimization on the baseline-self alignment logic

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

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/layout/GridTrackSizingAlgorithm.h"
 
 #include "core/layout/Grid.h"
 #include "core/layout/LayoutGrid.h"
 #include "platform/LengthFunctions.h"
 
@@ skipping 265 matching lines @@
   // intrinsic height, which is what we are interested in here. Thus we need to
   // set the block-axis override size to -1 (no possible resolution).
   if (ShouldClearOverrideContainingBlockContentSizeForChild(child, kForRows)) {
     SetOverrideContainingBlockContentSizeForChild(child, child_block_direction,
                                                   LayoutUnit(-1));
     child.SetNeedsLayout(LayoutInvalidationReason::kGridChanged, kMarkOnlyThis);
   }
 
   child.LayoutIfNeeded();
 
-  if (auto baseline_extent = ExtentForBaselineAlignment(child))
-    return baseline_extent.value();
+  // if (auto baseline_extent = ExtentForBaselineAlignment(child))
+  //  return baseline_extent.value();
 
   return child.LogicalHeight() + child.MarginLogicalHeight();
 }
 
 DISABLE_CFI_PERF
 LayoutUnit GridTrackSizingAlgorithmStrategy::MinContentForChild(
     LayoutBox& child) const {
   GridTrackSizingDirection child_inline_direction =
       FlowAwareDirectionForChild(GetLayoutGrid(), child, kForColumns);
   if (Direction() == child_inline_direction) {
     // If |child| has a relative logical width, we shouldn't let it override its
     // intrinsic width, which is what we are interested in here. Thus we need to
     // set the inline-axis override size to -1 (no possible resolution).
     if (ShouldClearOverrideContainingBlockContentSizeForChild(child,
                                                               kForColumns)) {
       SetOverrideContainingBlockContentSizeForChild(
           child, child_inline_direction, LayoutUnit(-1));
     }
 
     // FIXME: It's unclear if we should return the intrinsic width or the
     // preferred width.
     // See http://lists.w3.org/Archives/Public/www-style/2013Jan/0245.html
     LayoutUnit margin_logical_width =
         child.NeedsLayout() ? ComputeMarginLogicalSizeForChild(
                                   kInlineDirection, GetLayoutGrid(), child)
                             : child.MarginLogicalWidth();
     return child.MinPreferredLogicalWidth() + margin_logical_width;
   }
 
+  /*
   if (Direction() == kForColumns && !AvailableSpace()) {
     DCHECK(GetLayoutGrid()->IsOrthogonalChild(child));
     if (auto baseline_extent = ExtentForBaselineAlignment(child))
       return baseline_extent.value();
   }
+  */
 
   if (UpdateOverrideContainingBlockContentSizeForChild(child,
                                                        child_inline_direction))
     child.SetNeedsLayout(LayoutInvalidationReason::kGridChanged, kMarkOnlyThis);
   return LogicalHeightForChild(child);
 }
 
 DISABLE_CFI_PERF
 LayoutUnit GridTrackSizingAlgorithmStrategy::MaxContentForChild(
     LayoutBox& child) const {
@@ skipping 1161 matching lines @@
   DCHECK(algorithm_.IsValidTransition());
   DCHECK(!algorithm_.needs_setup_);
 }
 
 GridTrackSizingAlgorithm::StateMachine::~StateMachine() {
   algorithm_.AdvanceNextState();
   algorithm_.needs_setup_ = true;
 }
 
 }  // namespace blink