| Index: Source/core/page/animation/ImplicitAnimation.h
|
| diff --git a/Source/core/page/animation/ImplicitAnimation.h b/Source/core/page/animation/ImplicitAnimation.h
|
| index 0e54587ef891f4ed327d04f7a608b9cde1c4f7c1..a33c2c937f1503651fc6b98c415fd03cf05b4662 100644
|
| --- a/Source/core/page/animation/ImplicitAnimation.h
|
| +++ b/Source/core/page/animation/ImplicitAnimation.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
|
| @@ -43,7 +43,7 @@ public:
|
| {
|
| return adoptRef(new ImplicitAnimation(animation, animatingProperty, renderer, compositeAnimation, fromStyle));
|
| };
|
| -
|
| +
|
| CSSPropertyID transitionProperty() const { return m_transitionProperty; }
|
| CSSPropertyID animatingProperty() const { return m_animatingProperty; }
|
|
|
| @@ -68,12 +68,12 @@ public:
|
| void blendPropertyValueInStyle(CSSPropertyID, RenderStyle*);
|
|
|
| virtual double timeToNextService();
|
| -
|
| +
|
| bool active() const { return m_active; }
|
| void setActive(bool b) { m_active = b; }
|
|
|
| protected:
|
| - bool shouldSendEventForListener(Document::ListenerType) const;
|
| + bool shouldSendEventForListener(Document::ListenerType) const;
|
| bool sendTransitionEvent(const AtomicString&, double elapsedTime);
|
|
|
| void validateTransformFunctionList();
|
|
|