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

Side by Side Diff: Source/core/rendering/svg/RenderSVGText.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) 2006 Apple Computer, Inc. 2 * Copyright (C) 2006 Apple Computer, Inc.
3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> 3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
4 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 14 matching lines...) Expand all
25 #include "core/rendering/svg/RenderSVGBlock.h" 25 #include "core/rendering/svg/RenderSVGBlock.h"
26 #include "core/rendering/svg/SVGTextLayoutAttributesBuilder.h" 26 #include "core/rendering/svg/SVGTextLayoutAttributesBuilder.h"
27 #include "platform/transforms/AffineTransform.h" 27 #include "platform/transforms/AffineTransform.h"
28 28
29 namespace blink { 29 namespace blink {
30 30
31 class RenderSVGInlineText; 31 class RenderSVGInlineText;
32 class SVGTextElement; 32 class SVGTextElement;
33 class RenderSVGInlineText; 33 class RenderSVGInlineText;
34 34
35 class RenderSVGText FINAL : public RenderSVGBlock { 35 class RenderSVGText final : public RenderSVGBlock {
36 public: 36 public:
37 explicit RenderSVGText(SVGTextElement*); 37 explicit RenderSVGText(SVGTextElement*);
38 virtual ~RenderSVGText(); 38 virtual ~RenderSVGText();
39 39
40 virtual bool isChildAllowed(RenderObject*, RenderStyle*) const OVERRIDE; 40 virtual bool isChildAllowed(RenderObject*, RenderStyle*) const override;
41 41
42 void setNeedsPositioningValuesUpdate() { m_needsPositioningValuesUpdate = tr ue; } 42 void setNeedsPositioningValuesUpdate() { m_needsPositioningValuesUpdate = tr ue; }
43 virtual void setNeedsTransformUpdate() OVERRIDE { m_needsTransformUpdate = t rue; } 43 virtual void setNeedsTransformUpdate() override { m_needsTransformUpdate = t rue; }
44 void setNeedsTextMetricsUpdate() { m_needsTextMetricsUpdate = true; } 44 void setNeedsTextMetricsUpdate() { m_needsTextMetricsUpdate = true; }
45 virtual FloatRect paintInvalidationRectInLocalCoordinates() const OVERRIDE; 45 virtual FloatRect paintInvalidationRectInLocalCoordinates() const override;
46 46
47 static RenderSVGText* locateRenderSVGTextAncestor(RenderObject*); 47 static RenderSVGText* locateRenderSVGTextAncestor(RenderObject*);
48 static const RenderSVGText* locateRenderSVGTextAncestor(const RenderObject*) ; 48 static const RenderSVGText* locateRenderSVGTextAncestor(const RenderObject*) ;
49 49
50 bool needsReordering() const { return m_needsReordering; } 50 bool needsReordering() const { return m_needsReordering; }
51 Vector<SVGTextLayoutAttributes*>& layoutAttributes() { return m_layoutAttrib utes; } 51 Vector<SVGTextLayoutAttributes*>& layoutAttributes() { return m_layoutAttrib utes; }
52 52
53 void subtreeChildWasAdded(RenderObject*); 53 void subtreeChildWasAdded(RenderObject*);
54 void subtreeChildWillBeRemoved(RenderObject*, Vector<SVGTextLayoutAttributes *, 2>& affectedAttributes); 54 void subtreeChildWillBeRemoved(RenderObject*, Vector<SVGTextLayoutAttributes *, 2>& affectedAttributes);
55 void subtreeChildWasRemoved(const Vector<SVGTextLayoutAttributes*, 2>& affec tedAttributes); 55 void subtreeChildWasRemoved(const Vector<SVGTextLayoutAttributes*, 2>& affec tedAttributes);
56 void subtreeStyleDidChange(); 56 void subtreeStyleDidChange();
57 void subtreeTextDidChange(RenderSVGInlineText*); 57 void subtreeTextDidChange(RenderSVGInlineText*);
58 58
59 virtual const AffineTransform& localToParentTransform() const OVERRIDE { ret urn m_localTransform; } 59 virtual const AffineTransform& localToParentTransform() const override { ret urn m_localTransform; }
60 60
61 private: 61 private:
62 virtual const char* renderName() const OVERRIDE { return "RenderSVGText"; } 62 virtual const char* renderName() const override { return "RenderSVGText"; }
63 virtual bool isSVGText() const OVERRIDE { return true; } 63 virtual bool isSVGText() const override { return true; }
64 64
65 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE; 65 virtual void paint(PaintInfo&, const LayoutPoint&) override;
66 virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const F loatPoint& pointInParent, HitTestAction) OVERRIDE; 66 virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const F loatPoint& pointInParent, HitTestAction) override;
67 virtual PositionWithAffinity positionForPoint(const LayoutPoint&) OVERRIDE; 67 virtual PositionWithAffinity positionForPoint(const LayoutPoint&) override;
68 68
69 virtual void layout() OVERRIDE; 69 virtual void layout() override;
70 70
71 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const OVERRID E; 71 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const overrid e;
72 72
73 virtual void mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect&, const PaintInvalidationState*) const O VERRIDE; 73 virtual void mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect&, const PaintInvalidationState*) const o verride;
74 74
75 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) OV ERRIDE; 75 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) ov erride;
76 virtual void removeChild(RenderObject*) OVERRIDE; 76 virtual void removeChild(RenderObject*) override;
77 virtual void willBeDestroyed() OVERRIDE; 77 virtual void willBeDestroyed() override;
78 78
79 virtual FloatRect objectBoundingBox() const OVERRIDE { return frameRect(); } 79 virtual FloatRect objectBoundingBox() const override { return frameRect(); }
80 virtual FloatRect strokeBoundingBox() const OVERRIDE; 80 virtual FloatRect strokeBoundingBox() const override;
81 81
82 virtual RootInlineBox* createRootInlineBox() OVERRIDE; 82 virtual RootInlineBox* createRootInlineBox() override;
83 83
84 bool shouldHandleSubtreeMutations() const; 84 bool shouldHandleSubtreeMutations() const;
85 85
86 bool m_needsReordering : 1; 86 bool m_needsReordering : 1;
87 bool m_needsPositioningValuesUpdate : 1; 87 bool m_needsPositioningValuesUpdate : 1;
88 bool m_needsTransformUpdate : 1; 88 bool m_needsTransformUpdate : 1;
89 bool m_needsTextMetricsUpdate : 1; 89 bool m_needsTextMetricsUpdate : 1;
90 SVGTextLayoutAttributesBuilder m_layoutAttributesBuilder; 90 SVGTextLayoutAttributesBuilder m_layoutAttributesBuilder;
91 Vector<SVGTextLayoutAttributes*> m_layoutAttributes; 91 Vector<SVGTextLayoutAttributes*> m_layoutAttributes;
92 }; 92 };
93 93
94 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSVGText, isSVGText()); 94 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSVGText, isSVGText());
95 95
96 } 96 }
97 97
98 #endif 98 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/RenderSVGTSpan.h ('k') | Source/core/rendering/svg/RenderSVGTextPath.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698