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

Side by Side Diff: Source/core/rendering/svg/RenderSVGShape.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
« no previous file with comments | « Source/core/rendering/svg/RenderSVGRoot.h ('k') | Source/core/rendering/svg/RenderSVGTSpan.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
4 * Copyright (C) 2005 Eric Seidel <eric@webkit.org> 4 * Copyright (C) 2005 Eric Seidel <eric@webkit.org>
5 * Copyright (C) 2006 Apple Computer, Inc 5 * Copyright (C) 2006 Apple Computer, Inc
6 * Copyright (C) 2009 Google, Inc. 6 * Copyright (C) 2009 Google, Inc.
7 * Copyright (C) 2011 Renata Hodovan <reni@webkit.org> 7 * Copyright (C) 2011 Renata Hodovan <reni@webkit.org>
8 * Copyright (C) 2011 University of Szeged 8 * Copyright (C) 2011 University of Szeged
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 28 matching lines...) Expand all
39 class GraphicsContextStateSaver; 39 class GraphicsContextStateSaver;
40 class PointerEventsHitRules; 40 class PointerEventsHitRules;
41 class SVGGraphicsElement; 41 class SVGGraphicsElement;
42 42
43 class RenderSVGShape : public RenderSVGModelObject { 43 class RenderSVGShape : public RenderSVGModelObject {
44 public: 44 public:
45 explicit RenderSVGShape(SVGGraphicsElement*); 45 explicit RenderSVGShape(SVGGraphicsElement*);
46 virtual ~RenderSVGShape(); 46 virtual ~RenderSVGShape();
47 47
48 void setNeedsShapeUpdate() { m_needsShapeUpdate = true; } 48 void setNeedsShapeUpdate() { m_needsShapeUpdate = true; }
49 virtual void setNeedsBoundariesUpdate() OVERRIDE FINAL { m_needsBoundariesUp date = true; } 49 virtual void setNeedsBoundariesUpdate() override final { m_needsBoundariesUp date = true; }
50 virtual void setNeedsTransformUpdate() OVERRIDE FINAL { m_needsTransformUpda te = true; } 50 virtual void setNeedsTransformUpdate() override final { m_needsTransformUpda te = true; }
51 virtual void fillShape(GraphicsContext*) const; 51 virtual void fillShape(GraphicsContext*) const;
52 virtual void strokeShape(GraphicsContext*) const; 52 virtual void strokeShape(GraphicsContext*) const;
53 53
54 bool nodeAtFloatPointInternal(const HitTestRequest&, const FloatPoint&, Poin terEventsHitRules); 54 bool nodeAtFloatPointInternal(const HitTestRequest&, const FloatPoint&, Poin terEventsHitRules);
55 55
56 Path& path() const 56 Path& path() const
57 { 57 {
58 ASSERT(m_path); 58 ASSERT(m_path);
59 return *m_path; 59 return *m_path;
60 } 60 }
(...skipping 13 matching lines...) Expand all
74 Path* nonScalingStrokePath(const Path*, const AffineTransform&) const; 74 Path* nonScalingStrokePath(const Path*, const AffineTransform&) const;
75 75
76 FloatRect m_fillBoundingBox; 76 FloatRect m_fillBoundingBox;
77 FloatRect m_strokeBoundingBox; 77 FloatRect m_strokeBoundingBox;
78 78
79 private: 79 private:
80 // Hit-detection separated for the fill and the stroke 80 // Hit-detection separated for the fill and the stroke
81 bool fillContains(const FloatPoint&, bool requiresFill = true, const WindRul e fillRule = RULE_NONZERO); 81 bool fillContains(const FloatPoint&, bool requiresFill = true, const WindRul e fillRule = RULE_NONZERO);
82 bool strokeContains(const FloatPoint&, bool requiresStroke = true); 82 bool strokeContains(const FloatPoint&, bool requiresStroke = true);
83 83
84 virtual FloatRect paintInvalidationRectInLocalCoordinates() const OVERRIDE F INAL { return m_paintInvalidationBoundingBox; } 84 virtual FloatRect paintInvalidationRectInLocalCoordinates() const override f inal { return m_paintInvalidationBoundingBox; }
85 virtual const AffineTransform& localToParentTransform() const OVERRIDE FINAL { return m_localTransform; } 85 virtual const AffineTransform& localToParentTransform() const override final { return m_localTransform; }
86 virtual AffineTransform localTransform() const OVERRIDE FINAL { return m_loc alTransform; } 86 virtual AffineTransform localTransform() const override final { return m_loc alTransform; }
87 87
88 virtual bool isSVGShape() const OVERRIDE FINAL { return true; } 88 virtual bool isSVGShape() const override final { return true; }
89 virtual const char* renderName() const OVERRIDE { return "RenderSVGShape"; } 89 virtual const char* renderName() const override { return "RenderSVGShape"; }
90 90
91 virtual void layout() OVERRIDE FINAL; 91 virtual void layout() override final;
92 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL; 92 virtual void paint(PaintInfo&, const LayoutPoint&) override final;
93 virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& addit ionalOffset, const RenderLayerModelObject* paintContainer) const OVERRIDE FINAL; 93 virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& addit ionalOffset, const RenderLayerModelObject* paintContainer) const override final;
94 94
95 virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const F loatPoint& pointInParent, HitTestAction) OVERRIDE FINAL; 95 virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const F loatPoint& pointInParent, HitTestAction) override final;
96 96
97 virtual FloatRect objectBoundingBox() const OVERRIDE FINAL { return m_fillBo undingBox; } 97 virtual FloatRect objectBoundingBox() const override final { return m_fillBo undingBox; }
98 virtual FloatRect strokeBoundingBox() const OVERRIDE FINAL { return m_stroke BoundingBox; } 98 virtual FloatRect strokeBoundingBox() const override final { return m_stroke BoundingBox; }
99 FloatRect calculateObjectBoundingBox() const; 99 FloatRect calculateObjectBoundingBox() const;
100 FloatRect calculateStrokeBoundingBox() const; 100 FloatRect calculateStrokeBoundingBox() const;
101 void updatePaintInvalidationBoundingBox(); 101 void updatePaintInvalidationBoundingBox();
102 102
103 bool setupNonScalingStrokeContext(AffineTransform&, GraphicsContextStateSave r&); 103 bool setupNonScalingStrokeContext(AffineTransform&, GraphicsContextStateSave r&);
104 104
105 bool shouldGenerateMarkerPositions() const; 105 bool shouldGenerateMarkerPositions() const;
106 FloatRect markerRect(float strokeWidth) const; 106 FloatRect markerRect(float strokeWidth) const;
107 void processMarkerPositions(); 107 void processMarkerPositions();
108 108
(...skipping 10 matching lines...) Expand all
119 bool m_needsBoundariesUpdate : 1; 119 bool m_needsBoundariesUpdate : 1;
120 bool m_needsShapeUpdate : 1; 120 bool m_needsShapeUpdate : 1;
121 bool m_needsTransformUpdate : 1; 121 bool m_needsTransformUpdate : 1;
122 }; 122 };
123 123
124 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSVGShape, isSVGShape()); 124 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSVGShape, isSVGShape());
125 125
126 } 126 }
127 127
128 #endif 128 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/RenderSVGRoot.h ('k') | Source/core/rendering/svg/RenderSVGTSpan.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698