Avoiding name collisions between flexbox and grid

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

Index: third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h
index 38f2c5f04b1c689c72c28af49cb434eeb2ab5ebd..f33b8b4c37bdef8b246622bafa9475523c7e17a8 100644
--- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h
+++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h
@@ -235,6 +235,10 @@ class CORE_EXPORT LayoutFlexibleBox : public LayoutBlock {
       LayoutBox* child,
       float previousMaxContentFlexFraction) const;
 
+  static const StyleContentAlignmentData& contentAlignmentNormalBehavior();

[cbiesinger, 2017/04/07 21:26:28]

Please try to sort the functions in the header file the same as in the .cpp
file. In this case, please put these declarations before firstLineBoxBaseline in
the header.

[Daniel Bratell, 2017/04/07 21:54:50]

Done.

+  static int synthesizedBaselineFromContentBox(const LayoutBox&,
+                                               LineDirectionMode);
+
   // This is used to cache the preferred size for orthogonal flow children so we
   // don't have to relayout to get it
   HashMap<const LayoutObject*, LayoutUnit> m_intrinsicSizeAlongMainAxis;