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

Side by Side Diff: Source/core/rendering/style/KeyframeList.h

Issue 24085002: Correctly apply per-keyframe timing functions (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years 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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 void addProperty(CSSPropertyID prop) { m_properties.add(prop); } 51 void addProperty(CSSPropertyID prop) { m_properties.add(prop); }
52 bool containsProperty(CSSPropertyID prop) const { return m_properties.contai ns(prop); } 52 bool containsProperty(CSSPropertyID prop) const { return m_properties.contai ns(prop); }
53 const HashSet<CSSPropertyID>& properties() const { return m_properties; } 53 const HashSet<CSSPropertyID>& properties() const { return m_properties; }
54 54
55 double key() const { return m_key; } 55 double key() const { return m_key; }
56 void setKey(double key) { m_key = key; } 56 void setKey(double key) { m_key = key; }
57 57
58 const RenderStyle* style() const { return m_style.get(); } 58 const RenderStyle* style() const { return m_style.get(); }
59 void setStyle(PassRefPtr<RenderStyle> style) { m_style = style; } 59 void setStyle(PassRefPtr<RenderStyle> style) { m_style = style; }
60 60
61 static TimingFunction* timingFunction(const RenderStyle*, const AtomicString & name); 61 static TimingFunction* timingFunction(const RenderStyle& keyframeStyle);
62 62
63 private: 63 private:
64 double m_key; 64 double m_key;
65 HashSet<CSSPropertyID> m_properties; // The properties specified in this key frame. 65 HashSet<CSSPropertyID> m_properties; // The properties specified in this key frame.
66 RefPtr<RenderStyle> m_style; 66 RefPtr<RenderStyle> m_style;
67 }; 67 };
68 68
69 class KeyframeList { 69 class KeyframeList {
70 public: 70 public:
71 KeyframeList(RenderObject&, const AtomicString& animationName) 71 KeyframeList(RenderObject&, const AtomicString& animationName)
(...skipping 20 matching lines...) Expand all
92 92
93 private: 93 private:
94 AtomicString m_animationName; 94 AtomicString m_animationName;
95 Vector<KeyframeValue> m_keyframes; // Kept sorted by key. 95 Vector<KeyframeValue> m_keyframes; // Kept sorted by key.
96 HashSet<CSSPropertyID> m_properties; // The properties being animated. 96 HashSet<CSSPropertyID> m_properties; // The properties being animated.
97 }; 97 };
98 98
99 } // namespace WebCore 99 } // namespace WebCore
100 100
101 #endif // KeyframeList_h 101 #endif // KeyframeList_h
OLDNEW
« no previous file with comments | « Source/core/rendering/animation/WebAnimationProvider.cpp ('k') | Source/core/rendering/style/KeyframeList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698