Source/core/rendering/svg/RenderSVGBlock.h - Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard]

Side by Side Diff: Source/core/rendering/svg/RenderSVGBlock.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

« no previous file with comments | « Source/core/rendering/style/StylePendingImage.h ('k') | Source/core/rendering/svg/RenderSVGContainer.h » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2006 Apple Computer, Inc.	2 * Copyright (C) 2006 Apple Computer, Inc.

3 *	3 *

4 * This library is free software; you can redistribute it and/or	4 * This library is free software; you can redistribute it and/or

5 * modify it under the terms of the GNU Library General Public	5 * modify it under the terms of the GNU Library General Public

6 * License as published by the Free Software Foundation; either	6 * License as published by the Free Software Foundation; either

7 * version 2 of the License, or (at your option) any later version.	7 * version 2 of the License, or (at your option) any later version.

8 *	8 *

9 * This library is distributed in the hope that it will be useful,	9 * This library is distributed in the hope that it will be useful,

10 * but WITHOUT ANY WARRANTY; without even the implied warranty of	10 * but WITHOUT ANY WARRANTY; without even the implied warranty of

(...skipping 12 matching lines...) Expand all Loading...
23 #include "core/rendering/RenderBlockFlow.h"	23 #include "core/rendering/RenderBlockFlow.h"

24	24

25 namespace blink {	25 namespace blink {

26	26

27 class SVGElement;	27 class SVGElement;

28	28

29 class RenderSVGBlock : public RenderBlockFlow {	29 class RenderSVGBlock : public RenderBlockFlow {

30 public:	30 public:

31 explicit RenderSVGBlock(SVGElement*);	31 explicit RenderSVGBlock(SVGElement*);

32	32

33 virtual LayoutRect visualOverflowRect() const OVERRIDE FINAL;	33 virtual LayoutRect visualOverflowRect() const override final;

34	34

35 virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayer ModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) cons t OVERRIDE FINAL;	35 virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayer ModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) cons t override final;

36 virtual void computeFloatRectForPaintInvalidation(const RenderLayerModelObje ct* paintInvalidationContainer, FloatRect&, const PaintInvalidationState*) const OVERRIDE FINAL;	36 virtual void computeFloatRectForPaintInvalidation(const RenderLayerModelObje ct* paintInvalidationContainer, FloatRect&, const PaintInvalidationState*) const override final;

37	37

38 virtual void mapLocalToContainer(const RenderLayerModelObject* paintInvalida tionContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInvalidationState* = 0) const OVERRIDE FINAL;	38 virtual void mapLocalToContainer(const RenderLayerModelObject* paintInvalida tionContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInvalidationState* = 0) const override final;

39 virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObj ect* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE FINAL;	39 virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObj ect* ancestorToStopAt, RenderGeometryMap&) const override final;

40	40

41 virtual AffineTransform localTransform() const OVERRIDE FINAL { return m_loc alTransform; }	41 virtual AffineTransform localTransform() const override final { return m_loc alTransform; }

42	42

43 virtual LayerType layerTypeRequired() const OVERRIDE FINAL { return NoLayer; }	43 virtual LayerType layerTypeRequired() const override final { return NoLayer; }

44	44

45 virtual void invalidateTreeIfNeeded(const PaintInvalidationState&) OVERRIDE;	45 virtual void invalidateTreeIfNeeded(const PaintInvalidationState&) override;

46	46

47 protected:	47 protected:

48 virtual void willBeDestroyed() OVERRIDE;	48 virtual void willBeDestroyed() override;

49	49

50 AffineTransform m_localTransform;	50 AffineTransform m_localTransform;

51	51

52 private:	52 private:

53 virtual void updateFromStyle() OVERRIDE FINAL;	53 virtual void updateFromStyle() override final;

54	54

55 virtual bool isSVG() const OVERRIDE FINAL { return true; }	55 virtual bool isSVG() const override final { return true; }

56	56

57 virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedO ffset) const OVERRIDE FINAL;	57 virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedO ffset) const override final;

58	58

59 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE FINAL;	59 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ov erride final;

60	60

61 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE;	61 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) override;

62 };	62 };

63	63

64 }	64 }

65 #endif	65 #endif

OLD	NEW