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

Side by Side Diff: public/platform/WebAnimation.h

Issue 467123002: Revert of Rename WebAnimation to WebCompositorAnimation (patchset #5 of https://codereview.chromium… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 | « Source/web/LinkHighlight.cpp ('k') | public/platform/WebAnimationCurve.h » ('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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google 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 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y
17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N
20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */ 23 */
24 24
25 #ifndef WebTransformKeyframe_h 25 #ifndef WebAnimation_h
26 #define WebTransformKeyframe_h 26 #define WebAnimation_h
27 27
28 #include "WebCommon.h"
28 #include "WebNonCopyable.h" 29 #include "WebNonCopyable.h"
29 #include "WebPrivateOwnPtr.h" 30 #include "WebPrivateOwnPtr.h"
30 #include "WebTransformOperations.h" 31
31 #if INSIDE_BLINK 32 #if BLINK_IMPLEMENTATION
32 namespace WTF { template <typename T> class PassOwnPtr; } 33 #include "wtf/Forward.h"
33 #endif 34 #endif
34 35
36 #define WebCompositorAnimation WebAnimation
37
38 namespace blink {
39 class CCActiveAnimation;
40 }
41
35 namespace blink { 42 namespace blink {
36 43
37 class WebTransformKeyframe : public WebNonCopyable { 44 class WebAnimationCurve;
45
46 // A compositor driven animation.
47 class WebAnimation {
38 public: 48 public:
39 #if INSIDE_BLINK 49 enum TargetProperty {
40 BLINK_PLATFORM_EXPORT WebTransformKeyframe(double time, WTF::PassOwnPtr<WebT ransformOperations> value); 50 TargetPropertyTransform = 0,
41 #endif 51 TargetPropertyOpacity,
52 TargetPropertyFilter,
53 TargetPropertyScrollOffset
54 };
42 55
43 BLINK_PLATFORM_EXPORT ~WebTransformKeyframe(); 56 virtual ~WebAnimation() { }
44 57
45 BLINK_PLATFORM_EXPORT double time() const; 58 // An id is effectively the animation's name, and it is not unique.
59 virtual int id() = 0;
46 60
47 BLINK_PLATFORM_EXPORT const WebTransformOperations& value() const; 61 virtual TargetProperty targetProperty() const = 0;
48 62
49 private: 63 // This is the number of times that the animation will play. If this
50 double m_time; 64 // value is zero the animation will not play. If it is negative, then
51 WebPrivateOwnPtr<WebTransformOperations> m_value; 65 // the animation will loop indefinitely.
66 virtual int iterations() const = 0;
67 virtual void setIterations(int) = 0;
68
69 virtual double startTime() const = 0;
70 virtual void setStartTime(double monotonicTime) = 0;
71
72 virtual double timeOffset() const = 0;
73 virtual void setTimeOffset(double monotonicTime) = 0;
74
75 // If alternatesDirection is true, on odd numbered iterations we reverse the curve.
76 virtual bool alternatesDirection() const = 0;
77 virtual void setAlternatesDirection(bool) = 0;
52 }; 78 };
53 79
54 } // namespace blink 80 } // namespace blink
55 81
56 #endif // WebTransformKeyframe_h 82 #endif // WebAnimation_h
OLDNEW
« no previous file with comments | « Source/web/LinkHighlight.cpp ('k') | public/platform/WebAnimationCurve.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698