| Index: Source/core/page/animation/AnimationControllerPrivate.h
|
| diff --git a/Source/core/page/animation/AnimationControllerPrivate.h b/Source/core/page/animation/AnimationControllerPrivate.h
|
| index a2dba2c58b3089304c8bc093c9c96c207982a76a..a97ad75fc33ad7e90d1049829f0bb481aaee2238 100644
|
| --- a/Source/core/page/animation/AnimationControllerPrivate.h
|
| +++ b/Source/core/page/animation/AnimationControllerPrivate.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
|
| @@ -93,7 +93,7 @@ public:
|
| void setBeginAnimationUpdateTime(double t) { m_beginAnimationUpdateTime = t; }
|
| void endAnimationUpdate();
|
| void receivedStartTimeResponse(double);
|
| -
|
| +
|
| void addToAnimationsWaitingForStyle(AnimationBase*);
|
| void removeFromAnimationsWaitingForStyle(AnimationBase*);
|
|
|
| @@ -103,7 +103,7 @@ public:
|
| void animationWillBeRemoved(AnimationBase*);
|
|
|
| void scheduleServiceForRenderer(RenderObject*);
|
| -
|
| +
|
| private:
|
| void animationTimerFired(Timer<AnimationControllerPrivate>*);
|
|
|
| @@ -119,7 +119,7 @@ private:
|
| Timer<AnimationControllerPrivate> m_animationTimer;
|
| Timer<AnimationControllerPrivate> m_updateStyleIfNeededDispatcher;
|
| Frame* m_frame;
|
| -
|
| +
|
| class EventToDispatch {
|
| public:
|
| RefPtr<Element> element;
|
| @@ -127,10 +127,10 @@ private:
|
| String name;
|
| double elapsedTime;
|
| };
|
| -
|
| +
|
| Vector<EventToDispatch> m_eventsToDispatch;
|
| Vector<RefPtr<Node> > m_nodeChangesToDispatch;
|
| -
|
| +
|
| double m_beginAnimationUpdateTime;
|
|
|
| typedef HashSet<RefPtr<AnimationBase> > WaitingAnimationsSet;
|
|
|