Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(171)

Side by Side Diff: Source/core/rendering/shapes/RectangleShape.h

Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased the patch Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 20 matching lines...) Expand all
31 #define RectangleShape_h 31 #define RectangleShape_h
32 32
33 #include "core/rendering/shapes/Shape.h" 33 #include "core/rendering/shapes/Shape.h"
34 #include "platform/geometry/FloatPoint.h" 34 #include "platform/geometry/FloatPoint.h"
35 #include "platform/geometry/FloatRect.h" 35 #include "platform/geometry/FloatRect.h"
36 #include "platform/geometry/FloatSize.h" 36 #include "platform/geometry/FloatSize.h"
37 #include "wtf/Assertions.h" 37 #include "wtf/Assertions.h"
38 38
39 namespace blink { 39 namespace blink {
40 40
41 class RectangleShape FINAL : public Shape { 41 class RectangleShape final : public Shape {
42 public: 42 public:
43 RectangleShape(const FloatRect& bounds, const FloatSize& radii) 43 RectangleShape(const FloatRect& bounds, const FloatSize& radii)
44 : Shape() 44 : Shape()
45 , m_bounds(bounds) 45 , m_bounds(bounds)
46 , m_radii(radii) 46 , m_radii(radii)
47 { 47 {
48 } 48 }
49 49
50 virtual LayoutRect shapeMarginLogicalBoundingBox() const OVERRIDE { return s tatic_cast<LayoutRect>(shapeMarginBounds()); } 50 virtual LayoutRect shapeMarginLogicalBoundingBox() const override { return s tatic_cast<LayoutRect>(shapeMarginBounds()); }
51 virtual bool isEmpty() const OVERRIDE { return m_bounds.isEmpty(); } 51 virtual bool isEmpty() const override { return m_bounds.isEmpty(); }
52 virtual LineSegment getExcludedInterval(LayoutUnit logicalTop, LayoutUnit lo gicalHeight) const OVERRIDE; 52 virtual LineSegment getExcludedInterval(LayoutUnit logicalTop, LayoutUnit lo gicalHeight) const override;
53 virtual void buildDisplayPaths(DisplayPaths&) const OVERRIDE; 53 virtual void buildDisplayPaths(DisplayPaths&) const override;
54 54
55 private: 55 private:
56 FloatRect shapeMarginBounds() const; 56 FloatRect shapeMarginBounds() const;
57 57
58 float rx() const { return m_radii.width(); } 58 float rx() const { return m_radii.width(); }
59 float ry() const { return m_radii.height(); } 59 float ry() const { return m_radii.height(); }
60 float x() const { return m_bounds.x(); } 60 float x() const { return m_bounds.x(); }
61 float y() const { return m_bounds.y(); } 61 float y() const { return m_bounds.y(); }
62 float width() const { return m_bounds.width(); } 62 float width() const { return m_bounds.width(); }
63 float height() const { return m_bounds.height(); } 63 float height() const { return m_bounds.height(); }
64 64
65 FloatRect m_bounds; 65 FloatRect m_bounds;
66 FloatSize m_radii; 66 FloatSize m_radii;
67 }; 67 };
68 68
69 } // namespace blink 69 } // namespace blink
70 70
71 #endif // RectangleShape_h 71 #endif // RectangleShape_h
OLDNEW
« no previous file with comments | « Source/core/rendering/shapes/RasterShape.h ('k') | Source/core/rendering/shapes/ShapeOutsideInfo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698