Avoiding name collisions between flexbox and grid

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

 /*
  * Copyright (C) 2011 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 38 matching lines @@
   const char* name() const override { return "LayoutFlexibleBox"; }
 
   bool isFlexibleBox() const final { return true; }
   void layoutBlock(bool relayoutChildren) final;
 
   int baselinePosition(
       FontBaseline,
       bool firstLine,
       LineDirectionMode,
       LinePositionMode = PositionOnContainingLine) const override;
+
+  static const StyleContentAlignmentData& contentAlignmentNormalBehavior();
+  static int synthesizedBaselineFromContentBox(const LayoutBox&,
+                                               LineDirectionMode);
+
   int firstLineBoxBaseline() const override;
   int inlineBlockBaseline(LineDirectionMode) const override;
   IntSize originAdjustmentForScrollbars() const override;
   bool hasTopOverflow() const override;
   bool hasLeftOverflow() const override;
 
   void paintChildren(const PaintInfo&, const LayoutPoint&) const final;
 
   bool isHorizontalFlow() const;
 
@@ skipping 183 matching lines @@
   // This is SizeIsUnknown outside of layoutBlock()
   mutable SizeDefiniteness m_hasDefiniteHeight;
   bool m_inLayout;
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutFlexibleBox, isFlexibleBox());
 
 }  // namespace blink
 
 #endif  // LayoutFlexibleBox_h