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

Side by Side Diff: Source/core/rendering/svg/RenderSVGText.h

Issue 135563002: Update remaining rendering classes to use OVERRIDE / FINAL when needed (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 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 | Annotate | Revision Log
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 19 matching lines...) Expand all
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; 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() { m_needsTransformUpdate = true; } 43 virtual void setNeedsTransformUpdate() OVERRIDE { m_needsTransformUpdate = t rue; }
44 void setNeedsTextMetricsUpdate() { m_needsTextMetricsUpdate = true; } 44 void setNeedsTextMetricsUpdate() { m_needsTextMetricsUpdate = true; }
45 virtual FloatRect repaintRectInLocalCoordinates() const; 45 virtual FloatRect repaintRectInLocalCoordinates() 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(RenderSVGInlineText*); 56 void subtreeStyleDidChange(RenderSVGInlineText*);
57 void subtreeTextDidChange(RenderSVGInlineText*); 57 void subtreeTextDidChange(RenderSVGInlineText*);
58 58
59 private: 59 private:
60 virtual const char* renderName() const { return "RenderSVGText"; } 60 virtual const char* renderName() const OVERRIDE { return "RenderSVGText"; }
61 virtual bool isSVGText() const { return true; } 61 virtual bool isSVGText() const OVERRIDE { return true; }
62 62
63 virtual void paint(PaintInfo&, const LayoutPoint&); 63 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE;
64 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE; 64 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE;
65 virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const F loatPoint& pointInParent, HitTestAction); 65 virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const F loatPoint& pointInParent, HitTestAction) OVERRIDE;
66 virtual PositionWithAffinity positionForPoint(const LayoutPoint&) OVERRIDE F INAL; 66 virtual PositionWithAffinity positionForPoint(const LayoutPoint&) OVERRIDE;
67 67
68 virtual LayerType layerTypeRequired() const OVERRIDE { return NoLayer; } 68 virtual LayerType layerTypeRequired() const OVERRIDE { return NoLayer; }
69 virtual void layout(); 69 virtual void layout() OVERRIDE;
70 70
71 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const; 71 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const OVERRID E;
72 72
73 virtual LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObjec t* repaintContainer) const OVERRIDE; 73 virtual LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObjec t* repaintContainer) const OVERRIDE;
74 virtual void computeRectForRepaint(const RenderLayerModelObject* repaintCont ainer, LayoutRect&, bool fixed = false) const OVERRIDE; 74 virtual void computeRectForRepaint(const RenderLayerModelObject* repaintCont ainer, LayoutRect&, bool fixed = false) const OVERRIDE;
75 virtual void computeFloatRectForRepaint(const RenderLayerModelObject* repain tContainer, FloatRect&, bool fixed = false) const OVERRIDE; 75 virtual void computeFloatRectForRepaint(const RenderLayerModelObject* repain tContainer, FloatRect&, bool fixed = false) const OVERRIDE;
76 76
77 virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContai ner, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE; 77 virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContai ner, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE;
78 virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObj ect* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE; 78 virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObj ect* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE;
79 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0); 79 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) OV ERRIDE;
80 virtual void removeChild(RenderObject*) OVERRIDE; 80 virtual void removeChild(RenderObject*) OVERRIDE;
81 virtual void willBeDestroyed() OVERRIDE; 81 virtual void willBeDestroyed() OVERRIDE;
82 82
83 virtual FloatRect objectBoundingBox() const { return frameRect(); } 83 virtual FloatRect objectBoundingBox() const OVERRIDE { return frameRect(); }
84 virtual FloatRect strokeBoundingBox() const; 84 virtual FloatRect strokeBoundingBox() const OVERRIDE;
85 85
86 virtual const AffineTransform& localToParentTransform() const { return m_loc alTransform; } 86 virtual const AffineTransform& localToParentTransform() const OVERRIDE { ret urn m_localTransform; }
87 virtual AffineTransform localTransform() const { return m_localTransform; } 87 virtual AffineTransform localTransform() const OVERRIDE { return m_localTran sform; }
88 virtual RootInlineBox* createRootInlineBox(); 88 virtual RootInlineBox* createRootInlineBox() OVERRIDE;
89 89
90 virtual RenderBlock* firstLineBlock() const; 90 virtual RenderBlock* firstLineBlock() const OVERRIDE;
91 virtual void updateFirstLetter(); 91 virtual void updateFirstLetter() OVERRIDE;
92 92
93 bool shouldHandleSubtreeMutations() const; 93 bool shouldHandleSubtreeMutations() const;
94 94
95 bool m_needsReordering : 1; 95 bool m_needsReordering : 1;
96 bool m_needsPositioningValuesUpdate : 1; 96 bool m_needsPositioningValuesUpdate : 1;
97 bool m_needsTransformUpdate : 1; 97 bool m_needsTransformUpdate : 1;
98 bool m_needsTextMetricsUpdate : 1; 98 bool m_needsTextMetricsUpdate : 1;
99 AffineTransform m_localTransform; 99 AffineTransform m_localTransform;
100 SVGTextLayoutAttributesBuilder m_layoutAttributesBuilder; 100 SVGTextLayoutAttributesBuilder m_layoutAttributesBuilder;
101 Vector<SVGTextLayoutAttributes*> m_layoutAttributes; 101 Vector<SVGTextLayoutAttributes*> m_layoutAttributes;
102 }; 102 };
103 103
104 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSVGText, isSVGText()); 104 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSVGText, isSVGText());
105 105
106 } 106 }
107 107
108 #endif 108 #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