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

Side by Side Diff: Source/core/svg/SVGSVGElement.h

Issue 631153003: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/svg (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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/svg/SVGRenderingIntent.h ('k') | Source/core/svg/SVGSVGElement.cpp » ('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, 2006 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2010 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006, 2007, 2010 Rob Buis <buis@kde.org>
4 * Copyright (C) 2014 Google, Inc. 4 * Copyright (C) 2014 Google, Inc.
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 22 matching lines...) Expand all
33 namespace blink { 33 namespace blink {
34 34
35 class SVGMatrixTearOff; 35 class SVGMatrixTearOff;
36 class SVGAngleTearOff; 36 class SVGAngleTearOff;
37 class SVGNumberTearOff; 37 class SVGNumberTearOff;
38 class SVGTransformTearOff; 38 class SVGTransformTearOff;
39 class SVGViewSpec; 39 class SVGViewSpec;
40 class SVGViewElement; 40 class SVGViewElement;
41 class SMILTimeContainer; 41 class SMILTimeContainer;
42 42
43 class SVGSVGElement FINAL : public SVGGraphicsElement, 43 class SVGSVGElement final : public SVGGraphicsElement,
44 public SVGFitToViewBox, 44 public SVGFitToViewBox,
45 public SVGZoomAndPan { 45 public SVGZoomAndPan {
46 DEFINE_WRAPPERTYPEINFO(); 46 DEFINE_WRAPPERTYPEINFO();
47 public: 47 public:
48 DECLARE_NODE_FACTORY(SVGSVGElement); 48 DECLARE_NODE_FACTORY(SVGSVGElement);
49 49
50 #if !ENABLE(OILPAN) 50 #if !ENABLE(OILPAN)
51 using SVGGraphicsElement::ref; 51 using SVGGraphicsElement::ref;
52 using SVGGraphicsElement::deref; 52 using SVGGraphicsElement::deref;
53 #endif 53 #endif
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 void setupInitialView(const String& fragmentIdentifier, Element* anchorNode) ; 110 void setupInitialView(const String& fragmentIdentifier, Element* anchorNode) ;
111 111
112 bool hasIntrinsicWidth() const; 112 bool hasIntrinsicWidth() const;
113 bool hasIntrinsicHeight() const; 113 bool hasIntrinsicHeight() const;
114 114
115 SVGAnimatedLength* x() const { return m_x.get(); } 115 SVGAnimatedLength* x() const { return m_x.get(); }
116 SVGAnimatedLength* y() const { return m_y.get(); } 116 SVGAnimatedLength* y() const { return m_y.get(); }
117 SVGAnimatedLength* width() const { return m_width.get(); } 117 SVGAnimatedLength* width() const { return m_width.get(); }
118 SVGAnimatedLength* height() const { return m_height.get(); } 118 SVGAnimatedLength* height() const { return m_height.get(); }
119 119
120 virtual void trace(Visitor*) OVERRIDE; 120 virtual void trace(Visitor*) override;
121 121
122 private: 122 private:
123 explicit SVGSVGElement(Document&); 123 explicit SVGSVGElement(Document&);
124 virtual ~SVGSVGElement(); 124 virtual ~SVGSVGElement();
125 125
126 virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERR IDE; 126 virtual void parseAttribute(const QualifiedName&, const AtomicString&) overr ide;
127 virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE; 127 virtual bool isPresentationAttribute(const QualifiedName&) const override;
128 virtual void collectStyleForPresentationAttribute(const QualifiedName&, cons t AtomicString&, MutableStylePropertySet*) OVERRIDE; 128 virtual void collectStyleForPresentationAttribute(const QualifiedName&, cons t AtomicString&, MutableStylePropertySet*) override;
129 129
130 virtual bool rendererIsNeeded(const RenderStyle&) OVERRIDE; 130 virtual bool rendererIsNeeded(const RenderStyle&) override;
131 virtual RenderObject* createRenderer(RenderStyle*) OVERRIDE; 131 virtual RenderObject* createRenderer(RenderStyle*) override;
132 132
133 virtual InsertionNotificationRequest insertedInto(ContainerNode*) OVERRIDE; 133 virtual InsertionNotificationRequest insertedInto(ContainerNode*) override;
134 virtual void removedFrom(ContainerNode*) OVERRIDE; 134 virtual void removedFrom(ContainerNode*) override;
135 135
136 virtual void svgAttributeChanged(const QualifiedName&) OVERRIDE; 136 virtual void svgAttributeChanged(const QualifiedName&) override;
137 137
138 virtual bool selfHasRelativeLengths() const OVERRIDE; 138 virtual bool selfHasRelativeLengths() const override;
139 139
140 void inheritViewAttributes(SVGViewElement*); 140 void inheritViewAttributes(SVGViewElement*);
141 141
142 void updateCurrentTranslate(); 142 void updateCurrentTranslate();
143 143
144 virtual void finishParsingChildren() OVERRIDE; 144 virtual void finishParsingChildren() override;
145 145
146 enum CheckIntersectionOrEnclosure { 146 enum CheckIntersectionOrEnclosure {
147 CheckIntersection, 147 CheckIntersection,
148 CheckEnclosure 148 CheckEnclosure
149 }; 149 };
150 150
151 bool checkIntersectionOrEnclosure(const SVGElement&, const FloatRect&, Check IntersectionOrEnclosure) const; 151 bool checkIntersectionOrEnclosure(const SVGElement&, const FloatRect&, Check IntersectionOrEnclosure) const;
152 PassRefPtrWillBeRawPtr<StaticNodeList> collectIntersectionOrEnclosureList(co nst FloatRect&, SVGElement*, CheckIntersectionOrEnclosure) const; 152 PassRefPtrWillBeRawPtr<StaticNodeList> collectIntersectionOrEnclosureList(co nst FloatRect&, SVGElement*, CheckIntersectionOrEnclosure) const;
153 153
154 RefPtr<SVGAnimatedLength> m_x; 154 RefPtr<SVGAnimatedLength> m_x;
155 RefPtr<SVGAnimatedLength> m_y; 155 RefPtr<SVGAnimatedLength> m_y;
156 RefPtr<SVGAnimatedLength> m_width; 156 RefPtr<SVGAnimatedLength> m_width;
157 RefPtr<SVGAnimatedLength> m_height; 157 RefPtr<SVGAnimatedLength> m_height;
158 158
159 virtual AffineTransform localCoordinateSpaceTransform(SVGElement::CTMScope) const OVERRIDE; 159 virtual AffineTransform localCoordinateSpaceTransform(SVGElement::CTMScope) const override;
160 160
161 bool m_useCurrentView; 161 bool m_useCurrentView;
162 RefPtrWillBeMember<SMILTimeContainer> m_timeContainer; 162 RefPtrWillBeMember<SMILTimeContainer> m_timeContainer;
163 RefPtr<SVGPoint> m_translation; 163 RefPtr<SVGPoint> m_translation;
164 RefPtrWillBeMember<SVGViewSpec> m_viewSpec; 164 RefPtrWillBeMember<SVGViewSpec> m_viewSpec;
165 165
166 friend class SVGCurrentTranslateTearOff; 166 friend class SVGCurrentTranslateTearOff;
167 }; 167 };
168 168
169 } // namespace blink 169 } // namespace blink
170 170
171 #endif // SVGSVGElement_h 171 #endif // SVGSVGElement_h
OLDNEW
« no previous file with comments | « Source/core/svg/SVGRenderingIntent.h ('k') | Source/core/svg/SVGSVGElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698