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

Side by Side Diff: Source/core/rendering/svg/RenderSVGInline.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 Oliver Hunt <ojh16@student.canterbury.ac.nz> 2 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
3 * Copyright (C) 2006 Apple Computer Inc. 3 * Copyright (C) 2006 Apple Computer Inc.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 11 matching lines...) Expand all
22 #define RenderSVGInline_h 22 #define RenderSVGInline_h
23 23
24 #include "core/rendering/RenderInline.h" 24 #include "core/rendering/RenderInline.h"
25 25
26 namespace blink { 26 namespace blink {
27 27
28 class RenderSVGInline : public RenderInline { 28 class RenderSVGInline : public RenderInline {
29 public: 29 public:
30 explicit RenderSVGInline(Element*); 30 explicit RenderSVGInline(Element*);
31 31
32 virtual const char* renderName() const OVERRIDE { return "RenderSVGInline"; } 32 virtual const char* renderName() const override { return "RenderSVGInline"; }
33 virtual LayerType layerTypeRequired() const OVERRIDE FINAL { return NoLayer; } 33 virtual LayerType layerTypeRequired() const override final { return NoLayer; }
34 virtual bool isSVGInline() const OVERRIDE FINAL { return true; } 34 virtual bool isSVGInline() const override final { return true; }
35 virtual bool isSVG() const OVERRIDE FINAL { return true; } 35 virtual bool isSVG() const override final { return true; }
36 36
37 virtual bool isChildAllowed(RenderObject*, RenderStyle*) const OVERRIDE; 37 virtual bool isChildAllowed(RenderObject*, RenderStyle*) const override;
38 38
39 // Chapter 10.4 of the SVG Specification say that we should use the 39 // Chapter 10.4 of the SVG Specification say that we should use the
40 // object bounding box of the parent text element. 40 // object bounding box of the parent text element.
41 // We search for the root text element and take its bounding box. 41 // We search for the root text element and take its bounding box.
42 // It is also necessary to take the stroke and paint invalidation rect of 42 // It is also necessary to take the stroke and paint invalidation rect of
43 // this element, since we need it for filters. 43 // this element, since we need it for filters.
44 virtual FloatRect objectBoundingBox() const OVERRIDE FINAL; 44 virtual FloatRect objectBoundingBox() const override final;
45 virtual FloatRect strokeBoundingBox() const OVERRIDE FINAL; 45 virtual FloatRect strokeBoundingBox() const override final;
46 virtual FloatRect paintInvalidationRectInLocalCoordinates() const OVERRIDE F INAL; 46 virtual FloatRect paintInvalidationRectInLocalCoordinates() const override f inal;
47 47
48 virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayer ModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) cons t OVERRIDE FINAL; 48 virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayer ModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) cons t override final;
49 virtual void computeFloatRectForPaintInvalidation(const RenderLayerModelObje ct* paintInvalidationContainer, FloatRect&, const PaintInvalidationState*) const OVERRIDE FINAL; 49 virtual void computeFloatRectForPaintInvalidation(const RenderLayerModelObje ct* paintInvalidationContainer, FloatRect&, const PaintInvalidationState*) const override final;
50 virtual void mapLocalToContainer(const RenderLayerModelObject* paintInvalida tionContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInvalidationState* = 0) const OVERRIDE FINAL; 50 virtual void mapLocalToContainer(const RenderLayerModelObject* paintInvalida tionContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInvalidationState* = 0) const override final;
51 virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObj ect* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE FINAL; 51 virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObj ect* ancestorToStopAt, RenderGeometryMap&) const override final;
52 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const OVERRID E FINAL; 52 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const overrid e final;
53 53
54 private: 54 private:
55 virtual InlineFlowBox* createInlineFlowBox() OVERRIDE FINAL; 55 virtual InlineFlowBox* createInlineFlowBox() override final;
56 56
57 virtual void willBeDestroyed() OVERRIDE FINAL; 57 virtual void willBeDestroyed() override final;
58 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE FINAL; 58 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ov erride final;
59 59
60 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) OV ERRIDE FINAL; 60 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) ov erride final;
61 virtual void removeChild(RenderObject*) OVERRIDE FINAL; 61 virtual void removeChild(RenderObject*) override final;
62 }; 62 };
63 63
64 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSVGInline, isSVGInline()); 64 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSVGInline, isSVGInline());
65 65
66 } 66 }
67 67
68 #endif // !RenderSVGTSpan_H 68 #endif // !RenderSVGTSpan_H
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/RenderSVGImage.h ('k') | Source/core/rendering/svg/RenderSVGInlineText.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698