| 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 79afa5733e709eb54b2425dac9e628e48a8cbccc..f5ce4c6aa7c2ba131c56efc5134cbd048090fcc6 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,38 +37,21 @@ class LayoutFieldset final : public LayoutFlexibleBox {
|
| 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; }
|
| -
|
| - void computeIntrinsicLogicalWidths(
|
| - LayoutUnit& minLogicalWidth,
|
| - LayoutUnit& maxLogicalWidth) const override;
|
| - bool createsAnonymousWrapper() const override { return true; }
|
| + // We override the two baseline functions because we want our baseline to be
|
| + // the bottom of our margin box.
|
| bool isOfType(LayoutObjectType type) const override {
|
| - return type == LayoutObjectFieldset || LayoutFlexibleBox::isOfType(type);
|
| + return type == LayoutObjectFieldset || LayoutBlockFlow::isOfType(type);
|
| }
|
| +
|
| LayoutObject* layoutSpecialExcludedChild(bool relayoutChildren,
|
| SubtreeLayoutScope&) override;
|
| +
|
| + void computePreferredLogicalWidths() override;
|
| + bool avoidsFloats() const override { return true; }
|
| +
|
| void paintBoxDecorationBackground(const PaintInfo&,
|
| const LayoutPoint&) const override;
|
| void paintMask(const PaintInfo&, const LayoutPoint&) const override;
|
| - void updateAnonymousChildStyle(const LayoutObject& child,
|
| - ComputedStyle& childStyle) const override;
|
| -
|
| - void createInnerBlock();
|
| - void setLogicalLeftForChild(LayoutBox& child, LayoutUnit logicalLeft);
|
| - void setLogicalTopForChild(LayoutBox& child, LayoutUnit logicalTop);
|
| - void removeChild(LayoutObject*) override;
|
| -
|
| - LayoutBlock* m_innerBlock;
|
| };
|
|
|
| DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutFieldset, isFieldset());
|
|
|