Avoiding name collisions between flexbox and grid

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

Index: third_party/WebKit/Source/core/layout/LayoutGrid.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
index fc49a6d4499ca815695b019c3112becb4d3bbceb..5cd0ba46e1f3e49f6df46e8952949c26352b2a30 100644
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
@@ -480,7 +480,7 @@ LayoutUnit LayoutGrid::computeIntrinsicLogicalContentHeightUsing(
   return LayoutUnit();
 }
 
-static LayoutUnit overrideContainingBlockContentSizeForChild(
+LayoutUnit LayoutGrid::overrideContainingBlockContentSizeForChild(
     const LayoutBox& child,
     GridTrackSizingDirection direction) {
   return direction == ForColumns
@@ -1038,7 +1038,7 @@ Vector<LayoutUnit> LayoutGrid::trackSizesForComputedStyle(
   return tracks;
 }
 
-static const StyleContentAlignmentData& contentAlignmentNormalBehavior() {
+const StyleContentAlignmentData& LayoutGrid::contentAlignmentNormalBehavior() {
   static const StyleContentAlignmentData normalBehavior = {
       ContentPositionNormal, ContentDistributionStretch};
   return normalBehavior;
@@ -1599,8 +1599,8 @@ void LayoutGrid::updateAutoMarginsInColumnAxisIfNeeded(LayoutBox& child) {
 
 // TODO(lajava): This logic is shared by LayoutFlexibleBox, so it might be
 // refactored somehow.
-static int synthesizedBaselineFromContentBox(const LayoutBox& box,
-                                             LineDirectionMode direction) {
+int LayoutGrid::synthesizedBaselineFromContentBox(const LayoutBox& box,
+                                                  LineDirectionMode direction) {
   if (direction == HorizontalLine) {
     return (box.size().height() - box.borderBottom() - box.paddingBottom() -
             box.horizontalScrollbarHeight())
@@ -1611,8 +1611,8 @@ static int synthesizedBaselineFromContentBox(const LayoutBox& box,
       .toInt();
 }
 
-static int synthesizedBaselineFromBorderBox(const LayoutBox& box,
-                                            LineDirectionMode direction) {
+int LayoutGrid::synthesizedBaselineFromBorderBox(const LayoutBox& box,
+                                                 LineDirectionMode direction) {
   return (direction == HorizontalLine ? box.size().height()
                                       : box.size().width())
       .toInt();