Avoiding name collisions between flexbox and grid

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

Index: third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
index 909f9c5e1e211d35e36dfba5bf9f1b0360c50610..a5bfb738e8a8666755f1efd113351ac8ba0360b9 100644
--- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
@@ -164,8 +164,9 @@ float LayoutFlexibleBox::countIntrinsicSizeForAlgorithmChange(
   return maxContentFlexFraction;
 }
 
-static int synthesizedBaselineFromContentBox(const LayoutBox& box,
-                                             LineDirectionMode direction) {
+int LayoutFlexibleBox::synthesizedBaselineFromContentBox(
+    const LayoutBox& box,
+    LineDirectionMode direction) {
   if (direction == HorizontalLine) {
     return (box.size().height() - box.borderBottom() - box.paddingBottom() -
             box.verticalScrollbarWidth())
@@ -188,7 +189,8 @@ int LayoutFlexibleBox::baselinePosition(FontBaseline,
   return beforeMarginInLineDirection(direction) + baseline;
 }
 
-static const StyleContentAlignmentData& contentAlignmentNormalBehavior() {
+const StyleContentAlignmentData&
+LayoutFlexibleBox::contentAlignmentNormalBehavior() {
   // The justify-content property applies along the main axis, but since
   // flexing in the main axis is controlled by flex, stretch behaves as
   // flex-start (ignoring the specified fallback alignment, if any).