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

Side by Side Diff: cc/blink/web_float_animation_curve_impl.h

Issue 598853003: CC: Add curve (whole animation) timing function to compositor animations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Adressed comments, split up GetProgress function. Created 6 years, 3 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CC_BLINK_WEB_FLOAT_ANIMATION_CURVE_IMPL_H_ 5 #ifndef CC_BLINK_WEB_FLOAT_ANIMATION_CURVE_IMPL_H_
6 #define CC_BLINK_WEB_FLOAT_ANIMATION_CURVE_IMPL_H_ 6 #define CC_BLINK_WEB_FLOAT_ANIMATION_CURVE_IMPL_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "cc/blink/cc_blink_export.h" 9 #include "cc/blink/cc_blink_export.h"
10 #include "third_party/WebKit/public/platform/WebFloatAnimationCurve.h" 10 #include "third_party/WebKit/public/platform/WebFloatAnimationCurve.h"
(...skipping 19 matching lines...) Expand all
30 30
31 // WebFloatAnimationCurve implementation. 31 // WebFloatAnimationCurve implementation.
32 virtual void add(const blink::WebFloatKeyframe& keyframe); 32 virtual void add(const blink::WebFloatKeyframe& keyframe);
33 virtual void add(const blink::WebFloatKeyframe& keyframe, 33 virtual void add(const blink::WebFloatKeyframe& keyframe,
34 TimingFunctionType type); 34 TimingFunctionType type);
35 virtual void add(const blink::WebFloatKeyframe& keyframe, 35 virtual void add(const blink::WebFloatKeyframe& keyframe,
36 double x1, 36 double x1,
37 double y1, 37 double y1,
38 double x2, 38 double x2,
39 double y2); 39 double y2);
40 #if WEB_ANIMATION_SUPPORTS_ANIMATION_TIMING
41 virtual void setTimingFunction(TimingFunctionType = TimingFunctionTypeEase);
42 virtual void setTimingFunction(double x1, double y1, double x2, double y2);
43 #endif
40 44
41 virtual float getValue(double time) const; 45 virtual float getValue(double time) const;
42 46
43 scoped_ptr<cc::AnimationCurve> CloneToAnimationCurve() const; 47 scoped_ptr<cc::AnimationCurve> CloneToAnimationCurve() const;
44 48
45 private: 49 private:
46 scoped_ptr<cc::KeyframedFloatAnimationCurve> curve_; 50 scoped_ptr<cc::KeyframedFloatAnimationCurve> curve_;
47 51
48 DISALLOW_COPY_AND_ASSIGN(WebFloatAnimationCurveImpl); 52 DISALLOW_COPY_AND_ASSIGN(WebFloatAnimationCurveImpl);
49 }; 53 };
50 54
51 } // namespace cc_blink 55 } // namespace cc_blink
52 56
53 #endif // CC_BLINK_WEB_FLOAT_ANIMATION_CURVE_IMPL_H_ 57 #endif // CC_BLINK_WEB_FLOAT_ANIMATION_CURVE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698