[css-flexbox] Merge align-content and justify-content handling

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 118 matching lines @@
   LayoutUnit MainAxisContentExtentForChildIncludingScrollbar(
       const LayoutBox& child) const;
   LayoutUnit CrossAxisExtent() const;
   LayoutUnit MainAxisExtent() const;
   LayoutUnit CrossAxisContentExtent() const;
   LayoutUnit MainAxisContentExtent(LayoutUnit content_logical_height);
   LayoutUnit ComputeMainAxisExtentForChild(const LayoutBox& child,
                                            SizeType,
                                            const Length& size);
   TransformedWritingMode GetTransformedWritingMode() const;
+  StyleContentAlignmentData ResolvedJustifyContent() const;
+  StyleContentAlignmentData ResolvedAlignContent() const;
   LayoutUnit FlowAwareBorderStart() const;
   LayoutUnit FlowAwareBorderEnd() const;
   LayoutUnit FlowAwareBorderBefore() const;
   LayoutUnit FlowAwareBorderAfter() const;
   LayoutUnit FlowAwarePaddingStart() const;
   LayoutUnit FlowAwarePaddingEnd() const;
   LayoutUnit FlowAwarePaddingBefore() const;
   LayoutUnit FlowAwarePaddingAfter() const;
   LayoutUnit FlowAwareMarginStartForChild(const LayoutBox& child) const;
   LayoutUnit FlowAwareMarginEndForChild(const LayoutBox& child) const;
@@ skipping 109 matching lines @@
   // This is SizeIsUnknown outside of layoutBlock()
   mutable SizeDefiniteness has_definite_height_;
   bool in_layout_;
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutFlexibleBox, IsFlexibleBox());
 
 }  // namespace blink
 
 #endif  // LayoutFlexibleBox_h