Avoiding name collisions between flexbox and grid

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

 /*
  * 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 462 matching lines @@
   }
 
   if (logicalHeightLength.isFillAvailable())
     return containingBlock()->availableLogicalHeight(
                ExcludeMarginBorderPadding) -
            borderAndPadding;
   NOTREACHED();
   return LayoutUnit();
 }
 
-static LayoutUnit overrideContainingBlockContentSizeForChild(
+LayoutUnit LayoutGrid::overrideContainingBlockContentSizeForChild(
     const LayoutBox& child,
     GridTrackSizingDirection direction) {
   return direction == ForColumns
              ? child.overrideContainingBlockContentLogicalWidth()
              : child.overrideContainingBlockContentLogicalHeight();
 }
 
 bool LayoutGrid::isOrthogonalChild(const LayoutBox& child) const {
   return child.isHorizontalWritingMode() != isHorizontalWritingMode();
 }
@@ skipping 537 matching lines @@
       bool allRemainingTracksAreEmpty = remainingEmptyTracks == (lastLine - i);
       if (!allRemainingTracksAreEmpty ||
           !m_grid.isEmptyAutoRepeatTrack(direction, i))
         tracks[i - 1] -= gap;
     }
   }
 
   return tracks;
 }
 
-static const StyleContentAlignmentData& contentAlignmentNormalBehavior() {
+const StyleContentAlignmentData& LayoutGrid::contentAlignmentNormalBehavior() {
   static const StyleContentAlignmentData normalBehavior = {
       ContentPositionNormal, ContentDistributionStretch};
   return normalBehavior;
 }
 
 void LayoutGrid::applyStretchAlignmentToTracksIfNeeded(
     GridTrackSizingDirection direction) {
   LayoutUnit& availableSpace = m_trackSizingAlgorithm.freeSpace(direction);
   if (availableSpace <= 0 ||
       (direction == ForColumns &&
@@ skipping 540 matching lines @@
     child.setMarginAfter(availableAlignmentSpace / 2, style());
   } else if (marginBefore.isAuto()) {
     child.setMarginBefore(availableAlignmentSpace, style());
   } else if (marginAfter.isAuto()) {
     child.setMarginAfter(availableAlignmentSpace, style());
   }
 }
 
 // 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())
         .toInt();
   }
   return (box.size().width() - box.borderLeft() - box.paddingLeft() -
           box.verticalScrollbarWidth())
       .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();
 }
 
 int LayoutGrid::baselinePosition(FontBaseline,
                                  bool,
                                  LineDirectionMode direction,
                                  LinePositionMode mode) const {
   DCHECK_EQ(mode, PositionOnContainingLine);
@@ skipping 697 matching lines @@
   if (direction == ForRows)
     return grid.numTracks(ForRows);
 
   return grid.numTracks(ForRows)
              ? grid.numTracks(ForColumns)
              : GridPositionsResolver::explicitGridColumnCount(
                    styleRef(), grid.autoRepeatTracks(ForColumns));
 }
 
 }  // namespace blink