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

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

Issue 196943029: Web Animations API: Load resources referenced in element.animate() (reland) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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 /* 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/AnimatableValue.h" 34 #include "core/animation/AnimatableValue.h"
35 #include "core/css/CSSCrossfadeValue.h" 35 #include "core/css/CSSCrossfadeValue.h"
36 #include "core/rendering/style/StyleImage.h" 36 #include "core/rendering/style/StyleImage.h"
37 37
38 namespace WebCore { 38 namespace WebCore {
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 PassRefPtr<AnimatableImage> create(StyleImage* image) 43 static PassRefPtr<AnimatableImage> create(const StyleImage& image)
44 { 44 {
45 return adoptRef(new AnimatableImage(image)); 45 return create(image.cssValue());
46 } 46 }
47 PassRefPtrWillBeRawPtr<CSSValue> toCSSValue() const { return m_image->cssVal ue(); } 47 CSSValue* toCSSValue() const { return m_value.get(); }
48 StyleImage* toStyleImage() const { return m_image.get(); }
49 48
50 protected: 49 protected:
51 virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, do uble fraction) const OVERRIDE; 50 virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, do uble fraction) const OVERRIDE;
52 virtual PassRefPtr<AnimatableValue> addWith(const AnimatableValue*) const OV ERRIDE; 51 virtual PassRefPtr<AnimatableValue> addWith(const AnimatableValue*) const OV ERRIDE;
53 virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const OVER RIDE; 52 virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const OVER RIDE;
54 53
55 private: 54 private:
56 AnimatableImage(StyleImage* image) 55 static PassRefPtr<AnimatableImage> create(PassRefPtr<CSSValue> value)
57 : m_image(image)
58 { 56 {
59 ASSERT(m_image); 57 return adoptRef(new AnimatableImage(value));
58 }
59 AnimatableImage(PassRefPtr<CSSValue> value)
60 : m_value(value)
61 {
60 } 62 }
61 virtual AnimatableType type() const OVERRIDE { return TypeImage; } 63 virtual AnimatableType type() const OVERRIDE { return TypeImage; }
62 virtual bool equalTo(const AnimatableValue*) const OVERRIDE; 64 virtual bool equalTo(const AnimatableValue*) const OVERRIDE;
63 65
64 const RefPtr<StyleImage> m_image; 66 const RefPtr<CSSValue> m_value;
65 }; 67 };
66 68
67 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableImage, isImage()); 69 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableImage, isImage());
68 70
69 } // namespace WebCore 71 } // namespace WebCore
70 72
71 #endif // AnimatableImage_h 73 #endif // AnimatableImage_h
OLDNEW
« no previous file with comments | « LayoutTests/web-animations-api/resource-loading-expected.txt ('k') | Source/core/animation/AnimatableImage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698