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

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

Issue 203413008: Revert of Web Animations API: Load resources referenced in element.animate() (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(PassRefPtr<CSSValue> value) 43 static PassRefPtr<AnimatableImage> create(StyleImage* image)
44 { 44 {
45 return adoptRef(new AnimatableImage(value)); 45 return adoptRef(new AnimatableImage(image));
46 } 46 }
47 CSSValue* toCSSValue() const { return m_value.get(); } 47 PassRefPtrWillBeRawPtr<CSSValue> toCSSValue() const { return m_image->cssVal ue(); }
48 StyleImage* toStyleImage() const { return m_image.get(); }
48 49
49 protected: 50 protected:
50 virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, do uble fraction) const OVERRIDE; 51 virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, do uble fraction) const OVERRIDE;
51 virtual PassRefPtr<AnimatableValue> addWith(const AnimatableValue*) const OV ERRIDE; 52 virtual PassRefPtr<AnimatableValue> addWith(const AnimatableValue*) const OV ERRIDE;
52 virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const OVER RIDE; 53 virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const OVER RIDE;
53 54
54 private: 55 private:
55 AnimatableImage(PassRefPtr<CSSValue> value) 56 AnimatableImage(StyleImage* image)
56 : m_value(value) 57 : m_image(image)
57 { 58 {
58 ASSERT(m_value); 59 ASSERT(m_image);
59 ASSERT(m_value->isImageValue() || m_value->isImageSetValue() || m_value- >isGradientValue() || m_value->isCrossfadeValue() || m_value->isCursorImageValue ());
60 } 60 }
61 virtual AnimatableType type() const OVERRIDE { return TypeImage; } 61 virtual AnimatableType type() const OVERRIDE { return TypeImage; }
62 virtual bool equalTo(const AnimatableValue*) const OVERRIDE; 62 virtual bool equalTo(const AnimatableValue*) const OVERRIDE;
63 63
64 const RefPtr<CSSValue> m_value; 64 const RefPtr<StyleImage> m_image;
65 }; 65 };
66 66
67 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableImage, isImage()); 67 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableImage, isImage());
68 68
69 } // namespace WebCore 69 } // namespace WebCore
70 70
71 #endif // AnimatableImage_h 71 #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