| Index: Source/core/rendering/shapes/PolygonShape.h
|
| diff --git a/Source/core/rendering/shapes/PolygonShape.h b/Source/core/rendering/shapes/PolygonShape.h
|
| index 46b9b4f557080edc2b9afa17c5d93745e4b446e9..af65ecda32b4779f429159edd4ae8bc33ae6e357 100644
|
| --- a/Source/core/rendering/shapes/PolygonShape.h
|
| +++ b/Source/core/rendering/shapes/PolygonShape.h
|
| @@ -36,7 +36,7 @@
|
|
|
| namespace blink {
|
|
|
| -class OffsetPolygonEdge FINAL : public VertexPair {
|
| +class OffsetPolygonEdge final : public VertexPair {
|
| public:
|
| OffsetPolygonEdge(const FloatPolygonEdge& edge, const FloatSize& offset)
|
| : m_vertex1(edge.vertex1() + offset)
|
| @@ -44,8 +44,8 @@ public:
|
| {
|
| }
|
|
|
| - virtual const FloatPoint& vertex1() const OVERRIDE { return m_vertex1; }
|
| - virtual const FloatPoint& vertex2() const OVERRIDE { return m_vertex2; }
|
| + virtual const FloatPoint& vertex1() const override { return m_vertex1; }
|
| + virtual const FloatPoint& vertex2() const override { return m_vertex2; }
|
|
|
| bool isWithinYRange(float y1, float y2) const { return y1 <= minY() && y2 >= maxY(); }
|
| bool overlapsYRange(float y1, float y2) const { return y2 >= minY() && y1 <= maxY(); }
|
| @@ -57,7 +57,7 @@ private:
|
| FloatPoint m_vertex2;
|
| };
|
|
|
| -class PolygonShape FINAL : public Shape {
|
| +class PolygonShape final : public Shape {
|
| WTF_MAKE_NONCOPYABLE(PolygonShape);
|
| public:
|
| PolygonShape(PassOwnPtr<Vector<FloatPoint> > vertices, WindRule fillRule)
|
| @@ -66,10 +66,10 @@ public:
|
| {
|
| }
|
|
|
| - virtual LayoutRect shapeMarginLogicalBoundingBox() const OVERRIDE;
|
| - virtual bool isEmpty() const OVERRIDE { return m_polygon.isEmpty(); }
|
| - virtual LineSegment getExcludedInterval(LayoutUnit logicalTop, LayoutUnit logicalHeight) const OVERRIDE;
|
| - virtual void buildDisplayPaths(DisplayPaths&) const OVERRIDE;
|
| + virtual LayoutRect shapeMarginLogicalBoundingBox() const override;
|
| + virtual bool isEmpty() const override { return m_polygon.isEmpty(); }
|
| + virtual LineSegment getExcludedInterval(LayoutUnit logicalTop, LayoutUnit logicalHeight) const override;
|
| + virtual void buildDisplayPaths(DisplayPaths&) const override;
|
|
|
| private:
|
| FloatPolygon m_polygon;
|
|
|