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

Side by Side Diff: Source/core/platform/animation/CSSAnimationData.h

Issue 90033004: Have CSSAnimationData::name() / initialAnimationName() return an AtomicString (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
« no previous file with comments | « no previous file | Source/core/platform/animation/CSSAnimationData.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 }; 108 };
109 AnimationDirection direction() const { return static_cast<AnimationDirection >(m_direction); } 109 AnimationDirection direction() const { return static_cast<AnimationDirection >(m_direction); }
110 bool directionIsForwards() const { return m_direction == AnimationDirectionN ormal || m_direction == AnimationDirectionAlternate; } 110 bool directionIsForwards() const { return m_direction == AnimationDirectionN ormal || m_direction == AnimationDirectionAlternate; }
111 111
112 unsigned fillMode() const { return m_fillMode; } 112 unsigned fillMode() const { return m_fillMode; }
113 113
114 double duration() const { return m_duration; } 114 double duration() const { return m_duration; }
115 115
116 enum { IterationCountInfinite = -1 }; 116 enum { IterationCountInfinite = -1 };
117 double iterationCount() const { return m_iterationCount; } 117 double iterationCount() const { return m_iterationCount; }
118 const String& name() const { return m_name; } 118 const AtomicString& name() const { return m_name; }
119 EAnimPlayState playState() const { return static_cast<EAnimPlayState>(m_play State); } 119 EAnimPlayState playState() const { return static_cast<EAnimPlayState>(m_play State); }
120 CSSPropertyID property() const { return m_property; } 120 CSSPropertyID property() const { return m_property; }
121 TimingFunction* timingFunction() const { return m_timingFunction.get(); } 121 TimingFunction* timingFunction() const { return m_timingFunction.get(); }
122 AnimationMode animationMode() const { return m_mode; } 122 AnimationMode animationMode() const { return m_mode; }
123 123
124 void setDelay(double c) { m_delay = c; m_delaySet = true; } 124 void setDelay(double c) { m_delay = c; m_delaySet = true; }
125 void setDirection(AnimationDirection d) { m_direction = d; m_directionSet = true; } 125 void setDirection(AnimationDirection d) { m_direction = d; m_directionSet = true; }
126 void setDuration(double d) { ASSERT(d >= 0); m_duration = d; m_durationSet = true; } 126 void setDuration(double d) { ASSERT(d >= 0); m_duration = d; m_durationSet = true; }
127 void setFillMode(unsigned f) { m_fillMode = f; m_fillModeSet = true; } 127 void setFillMode(unsigned f) { m_fillMode = f; m_fillModeSet = true; }
128 void setIterationCount(double c) { m_iterationCount = c; m_iterationCountSet = true; } 128 void setIterationCount(double c) { m_iterationCount = c; m_iterationCountSet = true; }
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 bool m_timingFunctionSet : 1; 174 bool m_timingFunctionSet : 1;
175 175
176 bool m_isNone : 1; 176 bool m_isNone : 1;
177 177
178 public: 178 public:
179 static double initialAnimationDelay() { return 0; } 179 static double initialAnimationDelay() { return 0; }
180 static AnimationDirection initialAnimationDirection() { return AnimationDire ctionNormal; } 180 static AnimationDirection initialAnimationDirection() { return AnimationDire ctionNormal; }
181 static double initialAnimationDuration() { return 0; } 181 static double initialAnimationDuration() { return 0; }
182 static unsigned initialAnimationFillMode() { return AnimationFillModeNone; } 182 static unsigned initialAnimationFillMode() { return AnimationFillModeNone; }
183 static double initialAnimationIterationCount() { return 1.0; } 183 static double initialAnimationIterationCount() { return 1.0; }
184 static const String& initialAnimationName(); 184 static const AtomicString& initialAnimationName();
185 static EAnimPlayState initialAnimationPlayState() { return AnimPlayStatePlay ing; } 185 static EAnimPlayState initialAnimationPlayState() { return AnimPlayStatePlay ing; }
186 static CSSPropertyID initialAnimationProperty() { return CSSPropertyInvalid; } 186 static CSSPropertyID initialAnimationProperty() { return CSSPropertyInvalid; }
187 static const PassRefPtr<TimingFunction> initialAnimationTimingFunction() { r eturn CubicBezierTimingFunction::preset(CubicBezierTimingFunction::Ease); } 187 static const PassRefPtr<TimingFunction> initialAnimationTimingFunction() { r eturn CubicBezierTimingFunction::preset(CubicBezierTimingFunction::Ease); }
188 }; 188 };
189 189
190 } // namespace WebCore 190 } // namespace WebCore
191 191
192 #endif // CSSAnimationData_h 192 #endif // CSSAnimationData_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/platform/animation/CSSAnimationData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698