| Index: Source/core/rendering/RenderFlowThread.h
|
| diff --git a/Source/core/rendering/RenderFlowThread.h b/Source/core/rendering/RenderFlowThread.h
|
| index f106bb642d6700adbd3abf268210014e6902041f..276d30daa798cb1575184413d2a31e185e73fe5e 100644
|
| --- a/Source/core/rendering/RenderFlowThread.h
|
| +++ b/Source/core/rendering/RenderFlowThread.h
|
| @@ -57,22 +57,22 @@ public:
|
| RenderFlowThread();
|
| virtual ~RenderFlowThread() { };
|
|
|
| - virtual bool isRenderFlowThread() const OVERRIDE FINAL { return true; }
|
| + virtual bool isRenderFlowThread() const override final { return true; }
|
| virtual bool isRenderMultiColumnFlowThread() const { return false; }
|
| virtual bool isRenderPagedFlowThread() const { return false; }
|
|
|
| - virtual void layout() OVERRIDE;
|
| + virtual void layout() override;
|
|
|
| // Always create a RenderLayer for the RenderFlowThread so that we
|
| // can easily avoid drawing the children directly.
|
| - virtual LayerType layerTypeRequired() const OVERRIDE FINAL { return NormalLayer; }
|
| + virtual LayerType layerTypeRequired() const override final { return NormalLayer; }
|
|
|
| - virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE FINAL;
|
| + virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override final;
|
|
|
| virtual void addRegionToThread(RenderMultiColumnSet*) = 0;
|
| virtual void removeRegionFromThread(RenderMultiColumnSet*);
|
|
|
| - virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const OVERRIDE;
|
| + virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
|
|
|
| bool hasRegions() const { return m_multiColumnSetList.size(); }
|
|
|
|
|