third_party/WebKit/WebCore/page/animation/AnimationController.h - Issue 21165: Revert the merge. Mac build is mysteriously broken.

Side by Side Diff: third_party/WebKit/WebCore/page/animation/AnimationController.h

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 11 years, 10 months 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 | « third_party/WebKit/WebCore/page/animation/AnimationBase.cpp ('k') | third_party/WebKit/WebCore/page/animation/AnimationController.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2007 Apple Inc. All rights reserved.	2 * Copyright (C) 2007 Apple Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 *	7 *

8 * 1. Redistributions of source code must retain the above copyright	8 * 1. Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * 2. Redistributions in binary form must reproduce the above copyright	10 * 2. Redistributions in binary form must reproduce the above copyright

(...skipping 11 matching lines...) Expand all Loading...
22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND	23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF	25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF

26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

27 */	27 */

28	28

29 #ifndef AnimationController_h	29 #ifndef AnimationController_h

30 #define AnimationController_h	30 #define AnimationController_h

31	31

32 #include "CSSPropertyNames.h"

33 #include <wtf/Forward.h>	32 #include <wtf/Forward.h>

34	33

35 namespace WebCore {	34 namespace WebCore {

36	35

37 class AnimationBase;	36 class AnimationBase;

38 class AnimationControllerPrivate;	37 class AnimationControllerPrivate;

39 class AtomicString;	38 class AtomicString;

40 class Document;	39 class Document;

41 class Element;	40 class Element;

42 class Frame;	41 class Frame;

(...skipping 11 matching lines...) Expand all Loading...
54 PassRefPtr<RenderStyle> updateAnimations(RenderObject, RenderStyle newStyl e);	53 PassRefPtr<RenderStyle> updateAnimations(RenderObject, RenderStyle newStyl e);

55 PassRefPtr<RenderStyle> getAnimatedStyleForRenderer(RenderObject*);	54 PassRefPtr<RenderStyle> getAnimatedStyleForRenderer(RenderObject*);

56	55

57 // This is called when an accelerated animation or transition has actually s tarted to animate.	56 // This is called when an accelerated animation or transition has actually s tarted to animate.

58 void notifyAnimationStarted(RenderObject*, double startTime);	57 void notifyAnimationStarted(RenderObject*, double startTime);

59	58

60 bool pauseAnimationAtTime(RenderObject*, const String& name, double t); // T o be used only for testing	59 bool pauseAnimationAtTime(RenderObject*, const String& name, double t); // T o be used only for testing

61 bool pauseTransitionAtTime(RenderObject*, const String& property, double t); // To be used only for testing	60 bool pauseTransitionAtTime(RenderObject*, const String& property, double t); // To be used only for testing

62 unsigned numberOfActiveAnimations() const; // To be used only for testing	61 unsigned numberOfActiveAnimations() const; // To be used only for testing

63	62

64 bool isAnimatingPropertyOnRenderer(RenderObject*, CSSPropertyID, bool isRunn ingNow = true) const;	63 bool isAnimatingPropertyOnRenderer(RenderObject*, int property, bool isRunni ngNow = true) const;

65	64

66 void suspendAnimations(Document*);	65 void suspendAnimations(Document*);

67 void resumeAnimations(Document*);	66 void resumeAnimations(Document*);

68	67

69 void beginAnimationUpdate();	68 void beginAnimationUpdate();

70 void endAnimationUpdate();	69 void endAnimationUpdate();

71

72 static bool supportsAcceleratedAnimationOfProperty(CSSPropertyID);

73	70

74 private:	71 private:

75 AnimationControllerPrivate* m_data;	72 AnimationControllerPrivate* m_data;

76 };	73 };

77	74

78 } // namespace WebCore	75 } // namespace WebCore

79	76

80 #endif // AnimationController_h	77 #endif // AnimationController_h

81	78

OLD	NEW