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

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

Issue 1164573002: CSSValue Immediates: Change CSSValue to an object instead of a pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 4 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 22 matching lines...) Expand all
33 33
34 #include "core/animation/animatable/AnimatableValue.h" 34 #include "core/animation/animatable/AnimatableValue.h"
35 #include "core/css/CSSCrossfadeValue.h" 35 #include "core/css/CSSCrossfadeValue.h"
36 #include "core/style/StyleImage.h" 36 #include "core/style/StyleImage.h"
37 37
38 namespace blink { 38 namespace blink {
39 39
40 class AnimatableImage final : public AnimatableValue { 40 class AnimatableImage final : public AnimatableValue {
41 public: 41 public:
42 virtual ~AnimatableImage() { } 42 virtual ~AnimatableImage() { }
43 static PassRefPtrWillBeRawPtr<AnimatableImage> create(PassRefPtrWillBeRawPtr <CSSValue> value) 43 static PassRefPtrWillBeRawPtr<AnimatableImage> create(CSSValue value)
44 { 44 {
45 return adoptRefWillBeNoop(new AnimatableImage(value)); 45 return adoptRefWillBeNoop(new AnimatableImage(value));
46 } 46 }
47 CSSValue* toCSSValue() const { return m_value.get(); } 47 CSSValue toCSSValue() const { return m_value; }
48 48
49 DEFINE_INLINE_VIRTUAL_TRACE() 49 DEFINE_INLINE_VIRTUAL_TRACE()
50 { 50 {
51 visitor->trace(m_value); 51 visitor->trace(m_value);
52 AnimatableValue::trace(visitor); 52 AnimatableValue::trace(visitor);
53 } 53 }
54 54
55 protected: 55 protected:
56 virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const Animatab leValue*, double fraction) const override; 56 virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const Animatab leValue*, double fraction) const override;
57 virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const over ride; 57 virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const over ride;
58 58
59 private: 59 private:
60 AnimatableImage(PassRefPtrWillBeRawPtr<CSSValue> value) 60 AnimatableImage(CSSValue value)
61 : m_value(value) 61 : m_value(value)
62 { 62 {
63 ASSERT(m_value.get());
64 } 63 }
65 virtual AnimatableType type() const override { return TypeImage; } 64 virtual AnimatableType type() const override { return TypeImage; }
66 virtual bool equalTo(const AnimatableValue*) const override; 65 virtual bool equalTo(const AnimatableValue*) const override;
67 66
68 const RefPtrWillBeMember<CSSValue> m_value; 67 const CSSValue m_value;
69 }; 68 };
70 69
71 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableImage, isImage()); 70 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableImage, isImage());
72 71
73 } // namespace blink 72 } // namespace blink
74 73
75 #endif // AnimatableImage_h 74 #endif // AnimatableImage_h
OLDNEW
« no previous file with comments | « Source/core/animation/VisibilityStyleInterpolationTest.cpp ('k') | Source/core/animation/animatable/AnimatableImage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698