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

Side by Side Diff: Source/core/animation/VisibilityStyleInterpolation.h

Issue 1226293002: Fix virtual/override/final usage in Source/core/{animation,css,style}/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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 | Annotate | Revision Log
OLDNEW
1 #ifndef VisibilityStyleInterpolation_h 1 #ifndef VisibilityStyleInterpolation_h
2 #define VisibilityStyleInterpolation_h 2 #define VisibilityStyleInterpolation_h
3 3
4 #include "core/CSSValueKeywords.h" 4 #include "core/CSSValueKeywords.h"
5 #include "core/CoreExport.h" 5 #include "core/CoreExport.h"
6 #include "core/animation/StyleInterpolation.h" 6 #include "core/animation/StyleInterpolation.h"
7 #include "core/css/CSSPrimitiveValue.h" 7 #include "core/css/CSSPrimitiveValue.h"
8 8
9 namespace blink { 9 namespace blink {
10 10
11 class CORE_EXPORT VisibilityStyleInterpolation : public StyleInterpolation { 11 class CORE_EXPORT VisibilityStyleInterpolation : public StyleInterpolation {
12 public: 12 public:
13 static PassRefPtrWillBeRawPtr<VisibilityStyleInterpolation> create(const CSS Value& start, const CSSValue& end, CSSPropertyID id) 13 static PassRefPtrWillBeRawPtr<VisibilityStyleInterpolation> create(const CSS Value& start, const CSSValue& end, CSSPropertyID id)
14 { 14 {
15 RefPtrWillBeRawPtr<VisibilityStyleInterpolation> interpolation = adoptRe fWillBeNoop(new VisibilityStyleInterpolation( 15 RefPtrWillBeRawPtr<VisibilityStyleInterpolation> interpolation = adoptRe fWillBeNoop(new VisibilityStyleInterpolation(
16 visibilityToInterpolableValue(start), visibilityToInterpolableValue( end), id)); 16 visibilityToInterpolableValue(start), visibilityToInterpolableValue( end), id));
17 if (!isVisible(start)) { 17 if (!isVisible(start)) {
18 interpolation->m_notVisible = toCSSPrimitiveValue(start).getValueID( ); 18 interpolation->m_notVisible = toCSSPrimitiveValue(start).getValueID( );
19 } else if (!isVisible(end)) { 19 } else if (!isVisible(end)) {
20 interpolation->m_notVisible = toCSSPrimitiveValue(end).getValueID(); 20 interpolation->m_notVisible = toCSSPrimitiveValue(end).getValueID();
21 } 21 }
22 22
23 return interpolation.release(); 23 return interpolation.release();
24 } 24 }
25 25
26 static bool canCreateFrom(const CSSValue&); 26 static bool canCreateFrom(const CSSValue&);
27 static bool isVisible(const CSSValue&); 27 static bool isVisible(const CSSValue&);
28 28
29 virtual void apply(StyleResolverState&) const override; 29 void apply(StyleResolverState&) const override;
30 DECLARE_VIRTUAL_TRACE(); 30 DECLARE_VIRTUAL_TRACE();
31 31
32 private: 32 private:
33 VisibilityStyleInterpolation(PassOwnPtrWillBeRawPtr<InterpolableValue> start , PassOwnPtrWillBeRawPtr<InterpolableValue> end, CSSPropertyID id) 33 VisibilityStyleInterpolation(PassOwnPtrWillBeRawPtr<InterpolableValue> start , PassOwnPtrWillBeRawPtr<InterpolableValue> end, CSSPropertyID id)
34 : StyleInterpolation(start, end, id) 34 : StyleInterpolation(start, end, id)
35 , m_notVisible(CSSValueVisible) 35 , m_notVisible(CSSValueVisible)
36 { 36 {
37 } 37 }
38 38
39 static PassOwnPtrWillBeRawPtr<InterpolableValue> visibilityToInterpolableVal ue(const CSSValue&); 39 static PassOwnPtrWillBeRawPtr<InterpolableValue> visibilityToInterpolableVal ue(const CSSValue&);
40 static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToVisibility(Interp olableValue*, CSSValueID); 40 static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToVisibility(Interp olableValue*, CSSValueID);
41 41
42 CSSValueID m_notVisible; 42 CSSValueID m_notVisible;
43 43
44 friend class AnimationVisibilityStyleInterpolationTest; 44 friend class AnimationVisibilityStyleInterpolationTest;
45 }; 45 };
46 } 46 }
47 47
48 #endif 48 #endif
OLDNEW
« no previous file with comments | « Source/core/animation/StyleInterpolation.h ('k') | Source/core/animation/animatable/AnimatableClipPathOperation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698