Avoiding name collisions between flexbox and grid

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 251 matching lines @@
                                  SizingOperation) const;
 
   size_t gridItemSpan(const LayoutBox&, GridTrackSizingDirection);
 
   GridTrackSizingDirection flowAwareDirectionForChild(
       const LayoutBox&,
       GridTrackSizingDirection) const;
 
   size_t numTracks(GridTrackSizingDirection, const Grid&) const;
 
+  static LayoutUnit overrideContainingBlockContentSizeForChild(
+      const LayoutBox& child,
+      GridTrackSizingDirection);
+  static int synthesizedBaselineFromContentBox(const LayoutBox&,
+                                               LineDirectionMode);
+  static int synthesizedBaselineFromBorderBox(const LayoutBox&,
+                                              LineDirectionMode);
+  static const StyleContentAlignmentData& contentAlignmentNormalBehavior();
+
   typedef HashMap<unsigned,
                   std::unique_ptr<BaselineContext>,
                   DefaultHash<unsigned>::Hash,
                   WTF::UnsignedWithZeroKeyHashTraits<unsigned>>
       BaselineContextsMap;
 
   BaselineContextsMap m_rowAxisAlignmentContext;
   BaselineContextsMap m_colAxisAlignmentContext;
 
   Grid m_grid;
   GridTrackSizingAlgorithm m_trackSizingAlgorithm;
 
   Vector<LayoutUnit> m_rowPositions;
   Vector<LayoutUnit> m_columnPositions;
   LayoutUnit m_offsetBetweenColumns;
   LayoutUnit m_offsetBetweenRows;
   Vector<LayoutBox*> m_gridItemsOverflowingGridArea;
 
   LayoutUnit m_minContentHeight{-1};
   LayoutUnit m_maxContentHeight{-1};
 
   Optional<bool> m_hasDefiniteLogicalHeight;
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutGrid, isLayoutGrid());
 
 }  // namespace blink
 
 #endif  // LayoutGrid_h