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

Side by Side Diff: webkit/renderer/compositor_bindings/web_animation_impl.h

Issue 24165003: Don't clone WebAnimation in WebLayerImpl::addAnimation(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 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 | webkit/renderer/compositor_bindings/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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_ 5 #ifndef WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_
6 #define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_ 6 #define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_
7 7
8 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
9 #include "third_party/WebKit/public/platform/WebAnimation.h" 10 #include "third_party/WebKit/public/platform/WebAnimation.h"
10 #include "webkit/renderer/compositor_bindings/webkit_compositor_bindings_export. h" 11 #include "webkit/renderer/compositor_bindings/webkit_compositor_bindings_export. h"
11 12
12 namespace cc { class Animation; } 13 namespace cc { class Animation; }
13 14
14 namespace WebKit { class WebAnimationCurve; } 15 namespace WebKit { class WebAnimationCurve; }
15 16
16 namespace webkit { 17 namespace webkit {
17 18
(...skipping 11 matching lines...) Expand all
29 virtual TargetProperty targetProperty() const; 30 virtual TargetProperty targetProperty() const;
30 virtual int iterations() const; 31 virtual int iterations() const;
31 virtual void setIterations(int iterations); 32 virtual void setIterations(int iterations);
32 virtual double startTime() const; 33 virtual double startTime() const;
33 virtual void setStartTime(double monotonic_time); 34 virtual void setStartTime(double monotonic_time);
34 virtual double timeOffset() const; 35 virtual double timeOffset() const;
35 virtual void setTimeOffset(double monotonic_time); 36 virtual void setTimeOffset(double monotonic_time);
36 virtual bool alternatesDirection() const; 37 virtual bool alternatesDirection() const;
37 virtual void setAlternatesDirection(bool alternates); 38 virtual void setAlternatesDirection(bool alternates);
38 39
39 scoped_ptr<cc::Animation> CloneToAnimation(); 40 scoped_ptr<cc::Animation> PassAnimation();
40 41
41 private: 42 private:
43 cc::Animation* Animation() const {
jamesr 2013/09/23 18:09:31 this doesn't seem all that useful to me - when you
44 DCHECK(animation_);
45 return animation_.get();
46 }
47
42 scoped_ptr<cc::Animation> animation_; 48 scoped_ptr<cc::Animation> animation_;
43 49
44 DISALLOW_COPY_AND_ASSIGN(WebAnimationImpl); 50 DISALLOW_COPY_AND_ASSIGN(WebAnimationImpl);
45 }; 51 };
46 52
47 } // namespace webkit 53 } // namespace webkit
48 54
49 #endif // WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_ 55 #endif // WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | webkit/renderer/compositor_bindings/web_animation_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698