Revert commit# 415577 "Add grid/flex layout support for <fieldset>"

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 45 matching lines @@
       LinePositionMode = PositionOnContainingLine) const override;
   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;
-  virtual LayoutObject* layoutSpecialExcludedChild(bool relayoutChildren,
-                                                   SubtreeLayoutScope&) {
-    return nullptr;
-  }
 
   const OrderIterator& orderIterator() const { return m_orderIterator; }
 
   LayoutUnit crossSizeForPercentageResolution(const LayoutBox& child);
   LayoutUnit mainSizeForPercentageResolution(const LayoutBox& child);
   LayoutUnit childLogicalHeightForPercentageResolution(const LayoutBox& child);
 
   void clearCachedMainSizeForChild(const LayoutBox& child);
 
   LayoutUnit staticMainAxisPositionForPositionedChild(const LayoutBox& child);
@@ skipping 96 matching lines @@
   void cacheChildMainSize(const LayoutBox& child);
 
   void layoutFlexItems(bool relayoutChildren, SubtreeLayoutScope&);
   LayoutUnit autoMarginOffsetInMainAxis(const OrderedFlexItemList&,
                                         LayoutUnit& availableFreeSpace);
   void updateAutoMarginsInMainAxis(LayoutBox& child,
                                    LayoutUnit autoMarginOffset);
   bool hasAutoMarginsInCrossAxis(const LayoutBox& child) const;
   bool updateAutoMarginsInCrossAxis(LayoutBox& child,
                                     LayoutUnit availableAlignmentSpace);
-  void repositionLogicalHeightDependentFlexItems(Vector<LineContext>&,
-                                                 LayoutObject* childToExclude);
+  void repositionLogicalHeightDependentFlexItems(Vector<LineContext>&);
   LayoutUnit clientLogicalBottomAfterRepositioning();
 
   LayoutUnit availableAlignmentSpaceForChild(LayoutUnit lineCrossAxisExtent,
                                              const LayoutBox& child);
   LayoutUnit availableAlignmentSpaceForChildBeforeStretching(
       LayoutUnit lineCrossAxisExtent,
       const LayoutBox& child);
   LayoutUnit marginBoxAscentForChild(const LayoutBox& child);
 
   LayoutUnit computeChildMarginValue(Length margin);
   void prepareOrderIteratorAndMargins();
   LayoutUnit adjustChildSizeForMinAndMax(const LayoutBox& child,
                                          LayoutUnit childSize);
   LayoutUnit adjustChildSizeForAspectRatioCrossAxisMinAndMax(
       const LayoutBox& child,
       LayoutUnit childSize);
   FlexItem constructFlexItem(LayoutBox& child, ChildLayoutType);
   // The hypothetical main size of an item is the flex base size clamped
   // according to its min and max main size properties
   bool computeNextFlexLine(OrderedFlexItemList& orderedChildren,
                            LayoutUnit& sumFlexBaseSize,
                            double& totalFlexGrow,
                            double& totalFlexShrink,
                            double& totalWeightedFlexShrink,
                            LayoutUnit& sumHypotheticalMainSize,
-                           bool relayoutChildren,
-                           LayoutObject* childToExclude);
+                           bool relayoutChildren);
 
   void freezeInflexibleItems(FlexSign,
                              OrderedFlexItemList& children,
                              LayoutUnit& remainingFreeSpace,
                              double& totalFlexGrow,
                              double& totalFlexShrink,
                              double& totalWeightedFlexShrink);
   bool resolveFlexibleLengths(FlexSign,
                               OrderedFlexItemList&,
                               LayoutUnit initialFreeSpace,
@@ skipping 15 matching lines @@
   void layoutAndPlaceChildren(LayoutUnit& crossAxisOffset,
                               const OrderedFlexItemList&,
                               LayoutUnit availableFreeSpace,
                               bool relayoutChildren,
                               SubtreeLayoutScope&,
                               Vector<LineContext>&);
   void layoutColumnReverse(const OrderedFlexItemList&,
                            LayoutUnit crossAxisOffset,
                            LayoutUnit availableFreeSpace);
   void alignFlexLines(Vector<LineContext>&);
-  void alignChildren(const Vector<LineContext>&, LayoutObject* childToExclude);
+  void alignChildren(const Vector<LineContext>&);
   void applyStretchAlignmentToChild(LayoutBox& child,
                                     LayoutUnit lineCrossAxisExtent);
   void flipForRightToLeftColumn();
   void flipForWrapReverse(const Vector<LineContext>&,
                           LayoutUnit crossAxisStartEdge);
 
   float countIntrinsicSizeForAlgorithmChange(
       LayoutUnit maxPreferredWidth,
       LayoutBox* child,
       float previousMaxContentFlexFraction) const;
@@ skipping 14 matching lines @@
 
   // This is SizeIsUnknown outside of layoutBlock()
   mutable SizeDefiniteness m_hasDefiniteHeight;
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutFlexibleBox, isFlexibleBox());
 
 }  // namespace blink
 
 #endif  // LayoutFlexibleBox_h