diff options
Diffstat (limited to 'Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h')
-rw-r--r-- | Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h b/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h index 81d894ca6..9362147a9 100644 --- a/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h +++ b/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h @@ -1,7 +1,7 @@ /* * This file is part of the render object implementation for KHTML. * - * Copyright (C) 2003 Apple Computer, Inc. + * Copyright (C) 2003 Apple Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -20,8 +20,7 @@ * */ -#ifndef RenderDeprecatedFlexibleBox_h -#define RenderDeprecatedFlexibleBox_h +#pragma once #include "RenderBlock.h" @@ -31,29 +30,30 @@ class FlexBoxIterator; class RenderDeprecatedFlexibleBox final : public RenderBlock { public: - RenderDeprecatedFlexibleBox(Element&, PassRef<RenderStyle>); + RenderDeprecatedFlexibleBox(Element&, RenderStyle&&); virtual ~RenderDeprecatedFlexibleBox(); - Element& element() const { return toElement(nodeForNonAnonymous()); } + Element& element() const { return downcast<Element>(nodeForNonAnonymous()); } - virtual const char* renderName() const; + const char* renderName() const override; - virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) override; + void styleWillChange(StyleDifference, const RenderStyle& newStyle) override; - virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageHeight = 0); + void layoutBlock(bool relayoutChildren, LayoutUnit pageHeight = 0) override; void layoutHorizontalBox(bool relayoutChildren); void layoutVerticalBox(bool relayoutChildren); - virtual bool avoidsFloats() const { return true; } - virtual bool isDeprecatedFlexibleBox() const { return true; } - virtual bool isStretchingChildren() const { return m_stretchingChildren; } - virtual bool canCollapseAnonymousBlockChild() const override { return false; } + bool isStretchingChildren() const { return m_stretchingChildren; } - void placeChild(RenderBox* child, const LayoutPoint& location, LayoutSize* childLayoutDelta = 0); + bool avoidsFloats() const override { return true; } + bool canDropAnonymousBlockChild() const override { return false; } + + void placeChild(RenderBox* child, const LayoutPoint& location, LayoutSize* childLayoutDelta = nullptr); private: - virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override; - virtual void computePreferredLogicalWidths() override; + bool isDeprecatedFlexibleBox() const override { return true; } + void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override; + void computePreferredLogicalWidths() override; LayoutUnit allowedChildFlex(RenderBox* child, bool expanding, unsigned group); @@ -69,4 +69,4 @@ private: } // namespace WebCore -#endif // RenderDeprecatedFlexibleBox_h +SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderDeprecatedFlexibleBox, isDeprecatedFlexibleBox()) |