Reland of [css-align] Don't resolve 'auto' values for computed style.

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

 /*
  * 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 110 matching lines @@
 
   LayoutUnit ComputeIntrinsicLogicalContentHeightUsing(
       const Length& logical_height_length,
       LayoutUnit intrinsic_content_height,
       LayoutUnit border_and_padding) const override;
 
   void AddChild(LayoutObject* new_child,
                 LayoutObject* before_child = nullptr) override;
   void RemoveChild(LayoutObject*) override;
 
+  bool SelfAlignmentChangedToStretch(GridAxis,
+                                     const ComputedStyle& old_style,
+                                     const ComputedStyle& new_style,
+                                     const LayoutBox&) const;
+  bool SelfAlignmentChangedFromStretch(GridAxis,
+                                       const ComputedStyle& old_style,
+                                       const ComputedStyle& new_style,
+                                       const LayoutBox&) const;
   void StyleDidChange(StyleDifference, const ComputedStyle*) override;
 
   Optional<LayoutUnit> AvailableSpaceForGutters(GridTrackSizingDirection) const;
 
   bool ExplicitGridDidResize(const ComputedStyle&) const;
   bool NamedGridLinesDefinitionDidChange(const ComputedStyle&) const;
 
   size_t ComputeAutoRepeatTracksCount(
       GridTrackSizingDirection,
       Optional<LayoutUnit> available_size) const;
@@ skipping 63 matching lines @@
   void ApplyStretchAlignmentToTracksIfNeeded(GridTrackSizingDirection);
 
   void PaintChildren(const PaintInfo&, const LayoutPoint&) const override;
 
   LayoutUnit MarginLogicalHeightForChild(const LayoutBox&) const;
   LayoutUnit ComputeMarginLogicalSizeForChild(MarginDirection,
                                               const LayoutBox&) const;
   LayoutUnit AvailableAlignmentSpaceForChildBeforeStretching(
       LayoutUnit grid_area_breadth_for_child,
       const LayoutBox&) const;
-  StyleSelfAlignmentData JustifySelfForChild(const LayoutBox&) const;
-  StyleSelfAlignmentData AlignSelfForChild(const LayoutBox&) const;
+  StyleSelfAlignmentData JustifySelfForChild(
+      const LayoutBox&,
+      const ComputedStyle* = nullptr) const;
+  StyleSelfAlignmentData AlignSelfForChild(
+      const LayoutBox&,
+      const ComputedStyle* = nullptr) const;
+  StyleSelfAlignmentData SelfAlignmentForChild(
+      GridAxis,
+      const LayoutBox& child,
+      const ComputedStyle* = nullptr) const;
   void ApplyStretchAlignmentToChildIfNeeded(LayoutBox&);
   bool HasAutoSizeInColumnAxis(const LayoutBox& child) const {
     return IsHorizontalWritingMode() ? child.StyleRef().Height().IsAuto()
                                      : child.StyleRef().Width().IsAuto();
   }
   bool HasAutoSizeInRowAxis(const LayoutBox& child) const {
     return IsHorizontalWritingMode() ? child.StyleRef().Width().IsAuto()
                                      : child.StyleRef().Height().IsAuto();
   }
   bool AllowedToStretchChildAlongColumnAxis(const LayoutBox& child) const {
@@ skipping 80 matching lines @@
   LayoutUnit max_content_height_{-1};
 
   Optional<bool> has_definite_logical_height_;
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutGrid, IsLayoutGrid());
 
 }  // namespace blink
 
 #endif  // LayoutGrid_h