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

Side by Side Diff: Source/core/rendering/shapes/BoxShape.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) 2013 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2013 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 17 matching lines...) Expand all
28 */ 28 */
29 29
30 #ifndef BoxShape_h 30 #ifndef BoxShape_h
31 #define BoxShape_h 31 #define BoxShape_h
32 32
33 #include "core/rendering/shapes/Shape.h" 33 #include "core/rendering/shapes/Shape.h"
34 #include "platform/geometry/FloatRoundedRect.h" 34 #include "platform/geometry/FloatRoundedRect.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 class BoxShape FINAL : public Shape { 38 class BoxShape final : public Shape {
39 public: 39 public:
40 BoxShape(const FloatRoundedRect& bounds) 40 BoxShape(const FloatRoundedRect& bounds)
41 : Shape() 41 : Shape()
42 , m_bounds(bounds) 42 , m_bounds(bounds)
43 { 43 {
44 } 44 }
45 45
46 virtual LayoutRect shapeMarginLogicalBoundingBox() const OVERRIDE; 46 virtual LayoutRect shapeMarginLogicalBoundingBox() const override;
47 virtual bool isEmpty() const OVERRIDE { return m_bounds.isEmpty(); } 47 virtual bool isEmpty() const override { return m_bounds.isEmpty(); }
48 virtual LineSegment getExcludedInterval(LayoutUnit logicalTop, LayoutUnit lo gicalHeight) const OVERRIDE; 48 virtual LineSegment getExcludedInterval(LayoutUnit logicalTop, LayoutUnit lo gicalHeight) const override;
49 virtual void buildDisplayPaths(DisplayPaths&) const OVERRIDE; 49 virtual void buildDisplayPaths(DisplayPaths&) const override;
50 50
51 private: 51 private:
52 FloatRoundedRect shapeMarginBounds() const; 52 FloatRoundedRect shapeMarginBounds() const;
53 53
54 FloatRoundedRect m_bounds; 54 FloatRoundedRect m_bounds;
55 }; 55 };
56 56
57 } // namespace blink 57 } // namespace blink
58 58
59 #endif // BoxShape_h 59 #endif // BoxShape_h
60 60
OLDNEW
« no previous file with comments | « Source/core/rendering/compositing/RenderLayerCompositor.h ('k') | Source/core/rendering/shapes/PolygonShape.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698