| Index: Source/core/page/animation/KeyframeAnimation.h
|
| diff --git a/Source/core/page/animation/KeyframeAnimation.h b/Source/core/page/animation/KeyframeAnimation.h
|
| index 0ff4604b0dce29e6e377bcb13ab14d23acb5d1a0..0d8b159c11fa03225191e0d5d7ad0bfdccf3f673 100644
|
| --- a/Source/core/page/animation/KeyframeAnimation.h
|
| +++ b/Source/core/page/animation/KeyframeAnimation.h
|
| @@ -6,13 +6,13 @@
|
| * are met:
|
| *
|
| * 1. Redistributions of source code must retain the above copyright
|
| - * notice, this list of conditions and the following disclaimer.
|
| + * notice, this list of conditions and the following disclaimer.
|
| * 2. Redistributions in binary form must reproduce the above copyright
|
| * notice, this list of conditions and the following disclaimer in the
|
| - * documentation and/or other materials provided with the distribution.
|
| + * documentation and/or other materials provided with the distribution.
|
| * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
|
| * its contributors may be used to endorse or promote products derived
|
| - * from this software without specific prior written permission.
|
| + * from this software without specific prior written permission.
|
| *
|
| * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
|
| * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
| @@ -54,7 +54,7 @@ public:
|
| void setIndex(int i) { m_index = i; }
|
|
|
| bool hasAnimationForProperty(CSSPropertyID) const;
|
| -
|
| +
|
| void setUnanimatedStyle(PassRefPtr<RenderStyle> style) { m_unanimatedStyle = style; }
|
| RenderStyle* unanimatedStyle() const { return m_unanimatedStyle.get(); }
|
|
|
| @@ -82,7 +82,7 @@ protected:
|
| private:
|
| KeyframeAnimation(const CSSAnimationData* animation, RenderObject*, int index, CompositeAnimation*, RenderStyle* unanimatedStyle);
|
| virtual ~KeyframeAnimation();
|
| -
|
| +
|
| // Get the styles for the given property surrounding the current animation time and the progress between them.
|
| void fetchIntervalEndpointsForProperty(CSSPropertyID, const RenderStyle*& fromStyle, const RenderStyle*& toStyle, double& progress) const;
|
|
|
|
|