Avoiding name collisions between flexbox and grid

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

Index: third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.h
diff --git a/third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.h b/third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.h
index a868405d0a2e86d0722c67b7c901c3e1dde5419f..bcdbec9f8e2609eb50ef1193240ec25219ef369e 100644
--- a/third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.h
+++ b/third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.h
@@ -5,12 +5,13 @@
 #ifndef GridTrackSizingAlgorithm_h
 #define GridTrackSizingAlgorithm_h
 
+#include <memory>
+#include "core/layout/LayoutBox.h"
 #include "core/style/GridPositionsResolver.h"
 #include "core/style/GridTrackSize.h"
 #include "platform/LayoutUnit.h"
 #include "wtf/HashSet.h"
 #include "wtf/Optional.h"
-#include <memory>
 
 namespace blink {
 
@@ -20,6 +21,8 @@ class Grid;
 class GridTrackSizingAlgorithmStrategy;
 class LayoutGrid;
 
+enum MarginDirection;
+
 enum SizingOperation { TrackSizing, IntrinsicSizeComputation };
 
 enum TrackSizeComputationPhase {
@@ -268,6 +271,29 @@ class GridTrackSizingAlgorithmStrategy {
                                LayoutUnit& availableLogicalSpace) const;
   const LayoutGrid* layoutGrid() const { return m_algorithm.m_layoutGrid; }
 
+  // Helper functions
+  static LayoutUnit computeMarginLogicalSizeForChild(
+      MarginDirection forDirection,
+      const LayoutGrid*,
+      const LayoutBox& child);
+  static bool hasOverrideContainingBlockContentSizeForChild(
+      const LayoutBox& child,
+      GridTrackSizingDirection);
+  static LayoutUnit overrideContainingBlockContentSizeForChild(
+      const LayoutBox& child,
+      GridTrackSizingDirection);
+  static bool shouldClearOverrideContainingBlockContentSizeForChild(
+      const LayoutBox& child,
+      GridTrackSizingDirection);
+  static void setOverrideContainingBlockContentSizeForChild(
+      LayoutBox& child,
+      GridTrackSizingDirection,
+      LayoutUnit size);
+  static GridTrackSizingDirection flowAwareDirectionForChild(
+      const LayoutGrid*,
+      const LayoutBox& child,
+      GridTrackSizingDirection);
+
   GridTrackSizingAlgorithm& m_algorithm;
 };
 }