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

Side by Side Diff: Source/core/rendering/svg/RenderSVGModelObject.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) 2009, Google Inc. All rights reserved. 2 * Copyright (c) 2009, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 27 matching lines...) Expand all
38 38
39 // Most renderers in the SVG rendering tree will inherit from this class 39 // Most renderers in the SVG rendering tree will inherit from this class
40 // but not all. (e.g. RenderSVGForeignObject, RenderSVGBlock) thus methods 40 // but not all. (e.g. RenderSVGForeignObject, RenderSVGBlock) thus methods
41 // required by SVG renders need to be declared on RenderObject, but shared 41 // required by SVG renders need to be declared on RenderObject, but shared
42 // logic can go in this class or in SVGRenderSupport. 42 // logic can go in this class or in SVGRenderSupport.
43 43
44 class RenderSVGModelObject : public RenderObject { 44 class RenderSVGModelObject : public RenderObject {
45 public: 45 public:
46 explicit RenderSVGModelObject(SVGElement*); 46 explicit RenderSVGModelObject(SVGElement*);
47 47
48 virtual bool isChildAllowed(RenderObject*, RenderStyle*) const OVERRIDE; 48 virtual bool isChildAllowed(RenderObject*, RenderStyle*) const override;
49 virtual bool canHaveWhitespaceChildren() const OVERRIDE { return false; } 49 virtual bool canHaveWhitespaceChildren() const override { return false; }
50 50
51 virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayer ModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) cons t OVERRIDE; 51 virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayer ModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) cons t override;
52 virtual void computeFloatRectForPaintInvalidation(const RenderLayerModelObje ct* paintInvalidationContainer, FloatRect&, const PaintInvalidationState*) const OVERRIDE FINAL; 52 virtual void computeFloatRectForPaintInvalidation(const RenderLayerModelObje ct* paintInvalidationContainer, FloatRect&, const PaintInvalidationState*) const override final;
53 53
54 virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedO ffset) const OVERRIDE FINAL; 54 virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedO ffset) const override final;
55 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const OVERRID E; 55 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const overrid e;
56 56
57 virtual void mapLocalToContainer(const RenderLayerModelObject* paintInvalida tionContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInvalidationState* = 0) const OVERRIDE FINAL; 57 virtual void mapLocalToContainer(const RenderLayerModelObject* paintInvalida tionContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInvalidationState* = 0) const override final;
58 virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObj ect* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE FINAL; 58 virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObj ect* ancestorToStopAt, RenderGeometryMap&) const override final;
59 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE; 59 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ov erride;
60 60
61 virtual void computeLayerHitTestRects(LayerHitTestRects&) const OVERRIDE FIN AL; 61 virtual void computeLayerHitTestRects(LayerHitTestRects&) const override fin al;
62 62
63 SVGElement* element() const { return toSVGElement(RenderObject::node()); } 63 SVGElement* element() const { return toSVGElement(RenderObject::node()); }
64 64
65 virtual bool isSVG() const OVERRIDE FINAL { return true; } 65 virtual bool isSVG() const override final { return true; }
66 66
67 protected: 67 protected:
68 virtual void addLayerHitTestRects(LayerHitTestRects&, const RenderLayer* cur rentCompositedLayer, const LayoutPoint& layerOffset, const LayoutRect& container Rect) const OVERRIDE FINAL; 68 virtual void addLayerHitTestRects(LayerHitTestRects&, const RenderLayer* cur rentCompositedLayer, const LayoutPoint& layerOffset, const LayoutRect& container Rect) const override final;
69 virtual void willBeDestroyed() OVERRIDE; 69 virtual void willBeDestroyed() override;
70 70
71 private: 71 private:
72 // RenderSVGModelObject subclasses should use element() instead. 72 // RenderSVGModelObject subclasses should use element() instead.
73 void node() const WTF_DELETED_FUNCTION; 73 void node() const WTF_DELETED_FUNCTION;
74 74
75 // This method should never be called, SVG uses a different nodeAtPoint meth od 75 // This method should never be called, SVG uses a different nodeAtPoint meth od
76 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE FINAL; 76 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) override final;
77 virtual void absoluteFocusRingQuads(Vector<FloatQuad>&) OVERRIDE FINAL; 77 virtual void absoluteFocusRingQuads(Vector<FloatQuad>&) override final;
78 78
79 virtual void invalidateTreeIfNeeded(const PaintInvalidationState&) OVERRIDE FINAL; 79 virtual void invalidateTreeIfNeeded(const PaintInvalidationState&) override final;
80 }; 80 };
81 81
82 } 82 }
83 83
84 #endif 84 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/RenderSVGInlineText.h ('k') | Source/core/rendering/svg/RenderSVGPath.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698