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

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

Issue 576553002: remove WEB_ANIMATION_SUPPORTS_FULL_DIRECTION guards (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « no previous file | cc/blink/web_animation_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_ANIMATION_IMPL_H_ 5 #ifndef CC_BLINK_WEB_ANIMATION_IMPL_H_
6 #define CC_BLINK_WEB_ANIMATION_IMPL_H_ 6 #define CC_BLINK_WEB_ANIMATION_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/WebCompositorAnimation.h" 10 #include "third_party/WebKit/public/platform/WebCompositorAnimation.h"
(...skipping 24 matching lines...) Expand all
35 virtual double iterations() const; 35 virtual double iterations() const;
36 virtual void setIterations(double iterations); 36 virtual void setIterations(double iterations);
37 #else 37 #else
38 virtual int iterations() const; 38 virtual int iterations() const;
39 virtual void setIterations(int iterations); 39 virtual void setIterations(int iterations);
40 #endif 40 #endif
41 virtual double startTime() const; 41 virtual double startTime() const;
42 virtual void setStartTime(double monotonic_time); 42 virtual void setStartTime(double monotonic_time);
43 virtual double timeOffset() const; 43 virtual double timeOffset() const;
44 virtual void setTimeOffset(double monotonic_time); 44 virtual void setTimeOffset(double monotonic_time);
45 #if WEB_ANIMATION_SUPPORTS_FULL_DIRECTION
46 virtual Direction direction() const; 45 virtual Direction direction() const;
47 virtual void setDirection(Direction); 46 virtual void setDirection(Direction);
48 #else
49 virtual bool alternatesDirection() const;
50 virtual void setAlternatesDirection(bool alternates);
51 #endif
52 virtual double playbackRate() const; 47 virtual double playbackRate() const;
53 virtual void setPlaybackRate(double playback_rate); 48 virtual void setPlaybackRate(double playback_rate);
54 49
55 scoped_ptr<cc::Animation> PassAnimation(); 50 scoped_ptr<cc::Animation> PassAnimation();
56 51
57 private: 52 private:
58 scoped_ptr<cc::Animation> animation_; 53 scoped_ptr<cc::Animation> animation_;
59 54
60 DISALLOW_COPY_AND_ASSIGN(WebCompositorAnimationImpl); 55 DISALLOW_COPY_AND_ASSIGN(WebCompositorAnimationImpl);
61 }; 56 };
62 57
63 } // namespace cc_blink 58 } // namespace cc_blink
64 59
65 #endif // CC_BLINK_WEB_ANIMATION_IMPL_H_ 60 #endif // CC_BLINK_WEB_ANIMATION_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | cc/blink/web_animation_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698