diff options
author | avi <avi@chromium.org> | 2015-09-24 08:58:43 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-09-24 15:59:30 +0000 |
commit | 637331dc49b77acbd558edb8118b56ac4ef6a0fc (patch) | |
tree | bbbfae6d0847d62a5290984043f97d7c94001648 /cc/blink/web_float_animation_curve_impl.h | |
parent | fb61e3682fe7301373360fa851c7cb3dea9aec1f (diff) | |
download | chromium_src-637331dc49b77acbd558edb8118b56ac4ef6a0fc.zip chromium_src-637331dc49b77acbd558edb8118b56ac4ef6a0fc.tar.gz chromium_src-637331dc49b77acbd558edb8118b56ac4ef6a0fc.tar.bz2 |
Enforce marking "override" for functions overriding Blink in cc/.
BUG=535367
TEST=it all stays working
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1360283003
Cr-Commit-Position: refs/heads/master@{#350566}
Diffstat (limited to 'cc/blink/web_float_animation_curve_impl.h')
-rw-r--r-- | cc/blink/web_float_animation_curve_impl.h | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/cc/blink/web_float_animation_curve_impl.h b/cc/blink/web_float_animation_curve_impl.h index b5a97aa..42bab59 100644 --- a/cc/blink/web_float_animation_curve_impl.h +++ b/cc/blink/web_float_animation_curve_impl.h @@ -23,33 +23,33 @@ namespace cc_blink { class WebFloatAnimationCurveImpl : public blink::WebFloatAnimationCurve { public: CC_BLINK_EXPORT WebFloatAnimationCurveImpl(); - virtual ~WebFloatAnimationCurveImpl(); + ~WebFloatAnimationCurveImpl() override; // WebCompositorAnimationCurve implementation. - virtual AnimationCurveType type() const; + AnimationCurveType type() const override; // WebFloatAnimationCurve implementation. - virtual void add(const blink::WebFloatKeyframe& keyframe); - virtual void add(const blink::WebFloatKeyframe& keyframe, - TimingFunctionType type); - virtual void add(const blink::WebFloatKeyframe& keyframe, - double x1, - double y1, - double x2, - double y2); - virtual void add(const blink::WebFloatKeyframe& keyframe, - int steps, - float steps_start_offset); - virtual void setLinearTimingFunction(); - virtual void setCubicBezierTimingFunction(TimingFunctionType); - virtual void setCubicBezierTimingFunction(double x1, - double y1, - double x2, - double y2); - virtual void setStepsTimingFunction(int number_of_steps, - float steps_start_offset); + void add(const blink::WebFloatKeyframe& keyframe) override; + void add(const blink::WebFloatKeyframe& keyframe, + TimingFunctionType type) override; + void add(const blink::WebFloatKeyframe& keyframe, + double x1, + double y1, + double x2, + double y2) override; + void add(const blink::WebFloatKeyframe& keyframe, + int steps, + float steps_start_offset) override; + void setLinearTimingFunction() override; + void setCubicBezierTimingFunction(TimingFunctionType) override; + void setCubicBezierTimingFunction(double x1, + double y1, + double x2, + double y2) override; + void setStepsTimingFunction(int number_of_steps, + float steps_start_offset) override; - virtual float getValue(double time) const; + float getValue(double time) const override; scoped_ptr<cc::AnimationCurve> CloneToAnimationCurve() const; |