Revert "Add grid/flex layout support for <fieldset>" and "Auto-rebaseline for r409303"

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

Index: third_party/WebKit/Source/core/layout/LayoutFieldset.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutFieldset.h b/third_party/WebKit/Source/core/layout/LayoutFieldset.h
index eb778c4209da7070c7e2a019803a060471edb294..d00d1682b7c977566c55d222bfbdd43a87b69232 100644
--- a/third_party/WebKit/Source/core/layout/LayoutFieldset.h
+++ b/third_party/WebKit/Source/core/layout/LayoutFieldset.h
@@ -24,11 +24,11 @@
 #ifndef LayoutFieldset_h
 #define LayoutFieldset_h
 
-#include "core/layout/LayoutFlexibleBox.h"
+#include "core/layout/LayoutBlockFlow.h"
 
 namespace blink {
 
-class LayoutFieldset final : public LayoutFlexibleBox {
+class LayoutFieldset final : public LayoutBlockFlow {
 public:
     explicit LayoutFieldset(Element*);
 
@@ -37,28 +37,15 @@ public:
     const char* name() const override { return "LayoutFieldset"; }
 
 private:
-    void addChild(LayoutObject* newChild, LayoutObject* beforeChild = nullptr) override;
-    bool avoidsFloats() const override { return true; }
-
-    // We override the two baseline functions because we want our baseline to be the bottom of our margin box.
-    int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode) const override;
-    int inlineBlockBaseline(LineDirectionMode) const override { return -1; }
+    bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectFieldset || LayoutBlockFlow::isOfType(type); }
 
-    void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
-    bool createsAnonymousWrapper() const override { return true; }
-    bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectFieldset || LayoutFlexibleBox::isOfType(type); }
     LayoutObject* layoutSpecialExcludedChild(bool relayoutChildren, SubtreeLayoutScope&) override;
-    void paintBoxDecorationBackground(const PaintInfo&, const LayoutPoint&) const override;
-    void paintMask(const PaintInfo&, const LayoutPoint&) const override;
-    void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
 
-    void adjustInnerStyle();
-    void createInnerBlock();
-    void setLogicalLeftForChild(LayoutBox& child, LayoutUnit logicalLeft);
-    void setLogicalTopForChild(LayoutBox& child, LayoutUnit logicalTop);
-    void removeChild(LayoutObject*) override;
+    void computePreferredLogicalWidths() override;
+    bool avoidsFloats() const override { return true; }
 
-    LayoutBlock* m_innerBlock;
+    void paintBoxDecorationBackground(const PaintInfo&, const LayoutPoint&) const override;
+    void paintMask(const PaintInfo&, const LayoutPoint&) const override;
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutFieldset, isFieldset());