[css-grid] Wipe SizingOperation out

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 306 matching lines @@
     // 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 &&
-      algorithm_.sizing_operation_ == kIntrinsicSizeComputation) {
+  if (Direction() == kForColumns && !AvailableSpace()) {
     DCHECK(GetLayoutGrid()->IsOrthogonalChild(child));
     if (GetLayoutGrid()->IsBaselineAlignmentForChild(child, kGridRowAxis) &&
         GetLayoutGrid()->IsBaselineContextComputed(kGridRowAxis)) {
       auto& group =
           GetLayoutGrid()->GetBaselineGroupForChild(child, kGridRowAxis);
       return group.MaxAscent() + group.MaxDescent();
     }
   }
 
   if (UpdateOverrideContainingBlockContentSizeForChild(child,
@@ skipping 1059 matching lines @@
     case kRowSizingFirstIteration:
     case kRowSizingSecondIteration:
       return direction_ == kForRows;
   }
   NOTREACHED();
   return false;
 }
 
 void GridTrackSizingAlgorithm::Setup(GridTrackSizingDirection direction,
                                      size_t num_tracks,
-                                     SizingOperation sizing_operation,
                                      Optional<LayoutUnit> available_space,
                                      Optional<LayoutUnit> free_space) {
   DCHECK(needs_setup_);
   DCHECK_EQ(!!available_space, !!free_space);
   direction_ = direction;
   SetAvailableSpace(
       direction, available_space ? available_space.value().ClampNegativeToZero()
                                  : available_space);
 
-  sizing_operation_ = sizing_operation;
-
   if (available_space)
     strategy_ = WTF::MakeUnique<DefiniteSizeStrategy>(*this);
   else
     strategy_ = WTF::MakeUnique<IndefiniteSizeStrategy>(*this);
 
   content_sized_tracks_index_.Shrink(0);
   flexible_sized_tracks_index_.Shrink(0);
 
   SetFreeSpace(direction, free_space);
   Tracks(direction).Resize(num_tracks);
@@ skipping 67 matching lines @@
   DCHECK(algorithm_.IsValidTransition());
   DCHECK(!algorithm_.needs_setup_);
 }
 
 GridTrackSizingAlgorithm::StateMachine::~StateMachine() {
   algorithm_.AdvanceNextState();
   algorithm_.needs_setup_ = true;
 }
 
 }  // namespace blink