| Index: Source/core/rendering/RenderBoxModelObject.h
|
| diff --git a/Source/core/rendering/RenderBoxModelObject.h b/Source/core/rendering/RenderBoxModelObject.h
|
| index 6a592cdf98cb7f2db2dbab40899a47732530adb3..98ce0dce569aa8aab2e93a3a4ccb52d7a270a0f2 100644
|
| --- a/Source/core/rendering/RenderBoxModelObject.h
|
| +++ b/Source/core/rendering/RenderBoxModelObject.h
|
| @@ -76,7 +76,7 @@ public:
|
| virtual int pixelSnappedOffsetWidth() const;
|
| virtual int pixelSnappedOffsetHeight() const;
|
|
|
| - virtual void updateFromStyle() OVERRIDE;
|
| + virtual void updateFromStyle() override;
|
|
|
| // This will work on inlines to return the bounding box of all of the lines' border boxes.
|
| virtual IntRect borderBoundingBox() const = 0;
|
| @@ -156,18 +156,18 @@ public:
|
| virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const = 0;
|
| virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const = 0;
|
|
|
| - virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) const OVERRIDE;
|
| - virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE;
|
| + virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) const override;
|
| + virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const override;
|
|
|
| - virtual void setSelectionState(SelectionState) OVERRIDE;
|
| + virtual void setSelectionState(SelectionState) override;
|
|
|
| void contentChanged(ContentChangeType);
|
| bool hasAcceleratedCompositing() const;
|
|
|
| - virtual void computeLayerHitTestRects(LayerHitTestRects&) const OVERRIDE;
|
| + virtual void computeLayerHitTestRects(LayerHitTestRects&) const override;
|
|
|
| protected:
|
| - virtual void willBeDestroyed() OVERRIDE;
|
| + virtual void willBeDestroyed() override;
|
|
|
| LayoutPoint adjustedPositionRelativeToOffsetParent(const LayoutPoint&) const;
|
|
|
| @@ -215,7 +215,7 @@ public:
|
|
|
| private:
|
| LayoutUnit computedCSSPadding(const Length&) const;
|
| - virtual bool isBoxModelObject() const OVERRIDE FINAL { return true; }
|
| + virtual bool isBoxModelObject() const override final { return true; }
|
| };
|
|
|
| DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBoxModelObject, isBoxModelObject());
|
|
|