| Index: Source/core/rendering/RenderDeprecatedFlexibleBox.h
|
| diff --git a/Source/core/rendering/RenderDeprecatedFlexibleBox.h b/Source/core/rendering/RenderDeprecatedFlexibleBox.h
|
| index 00206ee3f89643e76581dae7272688040d0d8278..c29c71b6640ac1d491c88ca0475d20c5ef006da0 100644
|
| --- a/Source/core/rendering/RenderDeprecatedFlexibleBox.h
|
| +++ b/Source/core/rendering/RenderDeprecatedFlexibleBox.h
|
| @@ -29,27 +29,27 @@ namespace blink {
|
|
|
| class FlexBoxIterator;
|
|
|
| -class RenderDeprecatedFlexibleBox FINAL : public RenderBlock {
|
| +class RenderDeprecatedFlexibleBox final : public RenderBlock {
|
| public:
|
| RenderDeprecatedFlexibleBox(Element&);
|
| virtual ~RenderDeprecatedFlexibleBox();
|
|
|
| - virtual const char* renderName() const OVERRIDE;
|
| + virtual const char* renderName() const override;
|
|
|
| - virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) OVERRIDE;
|
| + virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) override;
|
|
|
| - virtual void layoutBlock(bool relayoutChildren) OVERRIDE;
|
| + virtual void layoutBlock(bool relayoutChildren) override;
|
| void layoutHorizontalBox(bool relayoutChildren);
|
| void layoutVerticalBox(bool relayoutChildren);
|
|
|
| - virtual bool isDeprecatedFlexibleBox() const OVERRIDE { return true; }
|
| + virtual bool isDeprecatedFlexibleBox() const override { return true; }
|
| bool isStretchingChildren() const { return m_stretchingChildren; }
|
| - virtual bool canCollapseAnonymousBlockChild() const OVERRIDE { return false; }
|
| + virtual bool canCollapseAnonymousBlockChild() const override { return false; }
|
|
|
| void placeChild(RenderBox* child, const LayoutPoint& location);
|
|
|
| private:
|
| - virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const OVERRIDE;
|
| + virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
|
|
|
| LayoutUnit allowedChildFlex(RenderBox* child, bool expanding, unsigned group);
|
|
|
|
|