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

Side by Side Diff: Source/core/animation/animatable/AnimatableSVGPaint.h

Issue 630993005: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/animation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added cpp to list 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 19 matching lines...) Expand all
30 30
31 #ifndef AnimatableSVGPaint_h 31 #ifndef AnimatableSVGPaint_h
32 #define AnimatableSVGPaint_h 32 #define AnimatableSVGPaint_h
33 33
34 #include "core/animation/animatable/AnimatableColor.h" 34 #include "core/animation/animatable/AnimatableColor.h"
35 #include "core/animation/animatable/AnimatableValue.h" 35 #include "core/animation/animatable/AnimatableValue.h"
36 #include "core/rendering/style/SVGRenderStyleDefs.h" 36 #include "core/rendering/style/SVGRenderStyleDefs.h"
37 37
38 namespace blink { 38 namespace blink {
39 39
40 class AnimatableSVGPaint FINAL : public AnimatableValue { 40 class AnimatableSVGPaint final : public AnimatableValue {
41 public: 41 public:
42 virtual ~AnimatableSVGPaint() { } 42 virtual ~AnimatableSVGPaint() { }
43 static PassRefPtrWillBeRawPtr<AnimatableSVGPaint> create( 43 static PassRefPtrWillBeRawPtr<AnimatableSVGPaint> create(
44 SVGPaintType type, SVGPaintType visitedLinkType, 44 SVGPaintType type, SVGPaintType visitedLinkType,
45 const Color& color, const Color& visitedLinkColor, 45 const Color& color, const Color& visitedLinkColor,
46 const String& uri, const String& visitedLinkURI) 46 const String& uri, const String& visitedLinkURI)
47 { 47 {
48 return create(type, visitedLinkType, AnimatableColor::create(color, visi tedLinkColor), uri, visitedLinkURI); 48 return create(type, visitedLinkType, AnimatableColor::create(color, visi tedLinkColor), uri, visitedLinkURI);
49 } 49 }
50 static PassRefPtrWillBeRawPtr<AnimatableSVGPaint> create( 50 static PassRefPtrWillBeRawPtr<AnimatableSVGPaint> create(
51 SVGPaintType type, SVGPaintType visitedLinkType, 51 SVGPaintType type, SVGPaintType visitedLinkType,
52 PassRefPtrWillBeRawPtr<AnimatableColor> color, 52 PassRefPtrWillBeRawPtr<AnimatableColor> color,
53 const String& uri, const String& visitedLinkURI) 53 const String& uri, const String& visitedLinkURI)
54 { 54 {
55 return adoptRefWillBeNoop(new AnimatableSVGPaint(type, visitedLinkType, color, uri, visitedLinkURI)); 55 return adoptRefWillBeNoop(new AnimatableSVGPaint(type, visitedLinkType, color, uri, visitedLinkURI));
56 } 56 }
57 SVGPaintType paintType() const { return m_type; }; 57 SVGPaintType paintType() const { return m_type; };
58 SVGPaintType visitedLinkPaintType() const { return m_visitedLinkType; }; 58 SVGPaintType visitedLinkPaintType() const { return m_visitedLinkType; };
59 Color color() const { return m_color->color(); }; 59 Color color() const { return m_color->color(); };
60 Color visitedLinkColor() const { return m_color->visitedLinkColor(); }; 60 Color visitedLinkColor() const { return m_color->visitedLinkColor(); };
61 const String& uri() const { return m_uri; }; 61 const String& uri() const { return m_uri; };
62 const String& visitedLinkURI() const { return m_visitedLinkURI; }; 62 const String& visitedLinkURI() const { return m_visitedLinkURI; };
63 63
64 virtual void trace(Visitor* visitor) OVERRIDE 64 virtual void trace(Visitor* visitor) override
65 { 65 {
66 visitor->trace(m_color); 66 visitor->trace(m_color);
67 AnimatableValue::trace(visitor); 67 AnimatableValue::trace(visitor);
68 } 68 }
69 69
70 protected: 70 protected:
71 virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const Animatab leValue*, double fraction) const OVERRIDE; 71 virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const Animatab leValue*, double fraction) const override;
72 virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const OVER RIDE; 72 virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const over ride;
73 73
74 private: 74 private:
75 AnimatableSVGPaint(SVGPaintType type, SVGPaintType visitedLinkType, PassRefP trWillBeRawPtr<AnimatableColor> color, const String& uri, const String& visitedL inkURI) 75 AnimatableSVGPaint(SVGPaintType type, SVGPaintType visitedLinkType, PassRefP trWillBeRawPtr<AnimatableColor> color, const String& uri, const String& visitedL inkURI)
76 : m_type(type) 76 : m_type(type)
77 , m_visitedLinkType(visitedLinkType) 77 , m_visitedLinkType(visitedLinkType)
78 , m_color(color) 78 , m_color(color)
79 , m_uri(uri) 79 , m_uri(uri)
80 , m_visitedLinkURI(visitedLinkURI) 80 , m_visitedLinkURI(visitedLinkURI)
81 { 81 {
82 } 82 }
83 virtual AnimatableType type() const OVERRIDE { return TypeSVGPaint; } 83 virtual AnimatableType type() const override { return TypeSVGPaint; }
84 virtual bool equalTo(const AnimatableValue*) const OVERRIDE; 84 virtual bool equalTo(const AnimatableValue*) const override;
85 85
86 SVGPaintType m_type; 86 SVGPaintType m_type;
87 SVGPaintType m_visitedLinkType; 87 SVGPaintType m_visitedLinkType;
88 // AnimatableColor includes a visited link color. 88 // AnimatableColor includes a visited link color.
89 RefPtrWillBeMember<AnimatableColor> m_color; 89 RefPtrWillBeMember<AnimatableColor> m_color;
90 String m_uri; 90 String m_uri;
91 String m_visitedLinkURI; 91 String m_visitedLinkURI;
92 }; 92 };
93 93
94 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableSVGPaint, isSVGPaint()); 94 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableSVGPaint, isSVGPaint());
95 95
96 } // namespace blink 96 } // namespace blink
97 97
98 #endif // AnimatableSVGPaint_h 98 #endif // AnimatableSVGPaint_h
OLDNEW
« no previous file with comments | « Source/core/animation/animatable/AnimatableSVGLength.h ('k') | Source/core/animation/animatable/AnimatableShadow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698