| Index: Source/core/rendering/RenderDeprecatedFlexibleBox.h
|
| diff --git a/Source/core/rendering/RenderDeprecatedFlexibleBox.h b/Source/core/rendering/RenderDeprecatedFlexibleBox.h
|
| index f6576ab2c95146926e182695737baa6cbb48a76a..be2aacb3b3181c0e12aebaf0712d0f2d4bec6319 100644
|
| --- a/Source/core/rendering/RenderDeprecatedFlexibleBox.h
|
| +++ b/Source/core/rendering/RenderDeprecatedFlexibleBox.h
|
| @@ -31,11 +31,9 @@ class FlexBoxIterator;
|
|
|
| class RenderDeprecatedFlexibleBox FINAL : public RenderBlock {
|
| public:
|
| - RenderDeprecatedFlexibleBox(Element*);
|
| + RenderDeprecatedFlexibleBox(Element&);
|
| virtual ~RenderDeprecatedFlexibleBox();
|
|
|
| - static RenderDeprecatedFlexibleBox* createAnonymous(Document*);
|
| -
|
| virtual const char* renderName() const OVERRIDE;
|
|
|
| virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) OVERRIDE;
|
| @@ -51,7 +49,7 @@ public:
|
|
|
| void placeChild(RenderBox* child, const LayoutPoint& location);
|
|
|
| -protected:
|
| +private:
|
| virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const OVERRIDE;
|
| virtual void computePreferredLogicalWidths() OVERRIDE;
|
|
|
| @@ -61,11 +59,10 @@ protected:
|
| bool isVertical() const { return style()->boxOrient() == VERTICAL; }
|
| bool isHorizontal() const { return style()->boxOrient() == HORIZONTAL; }
|
|
|
| - bool m_stretchingChildren;
|
| -
|
| -private:
|
| void applyLineClamp(FlexBoxIterator&, bool relayoutChildren);
|
| void clearLineClamp();
|
| +
|
| + bool m_stretchingChildren;
|
| };
|
|
|
| DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderDeprecatedFlexibleBox, isDeprecatedFlexibleBox());
|
|
|