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

Side by Side Diff: cc/layer.h

Issue 11636051: Rename ActiveAnimation -> Animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 11 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 | « cc/cc_tests.gyp ('k') | cc/layer.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 2010 The Chromium Authors. All rights reserved. 1 // Copyright 2010 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_LAYER_H_ 5 #ifndef CC_LAYER_H_
6 #define CC_LAYER_H_ 6 #define CC_LAYER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 15 matching lines...) Expand all
26 #include "ui/gfx/rect_f.h" 26 #include "ui/gfx/rect_f.h"
27 #include "ui/gfx/transform.h" 27 #include "ui/gfx/transform.h"
28 28
29 namespace WebKit { 29 namespace WebKit {
30 class WebAnimationDelegate; 30 class WebAnimationDelegate;
31 class WebLayerScrollClient; 31 class WebLayerScrollClient;
32 } 32 }
33 33
34 namespace cc { 34 namespace cc {
35 35
36 class ActiveAnimation; 36 class Animation;
37 struct AnimationEvent; 37 struct AnimationEvent;
38 class LayerAnimationDelegate; 38 class LayerAnimationDelegate;
39 class LayerImpl; 39 class LayerImpl;
40 class LayerTreeHost; 40 class LayerTreeHost;
41 class LayerTreeImpl; 41 class LayerTreeImpl;
42 class PriorityCalculator; 42 class PriorityCalculator;
43 class ResourceUpdateQueue; 43 class ResourceUpdateQueue;
44 class ScrollbarLayer; 44 class ScrollbarLayer;
45 struct AnimationEvent; 45 struct AnimationEvent;
46 struct RenderingStats; 46 struct RenderingStats;
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 // When true, the layer's contents are not scaled by the current page scale factor. 250 // When true, the layer's contents are not scaled by the current page scale factor.
251 // setBoundsContainPageScale recursively sets the value on all child layers. 251 // setBoundsContainPageScale recursively sets the value on all child layers.
252 void setBoundsContainPageScale(bool); 252 void setBoundsContainPageScale(bool);
253 bool boundsContainPageScale() const { return m_boundsContainPageScale; } 253 bool boundsContainPageScale() const { return m_boundsContainPageScale; }
254 254
255 LayerTreeHost* layerTreeHost() const { return m_layerTreeHost; } 255 LayerTreeHost* layerTreeHost() const { return m_layerTreeHost; }
256 256
257 // Set the priority of all desired textures in this layer. 257 // Set the priority of all desired textures in this layer.
258 virtual void setTexturePriorities(const PriorityCalculator&) { } 258 virtual void setTexturePriorities(const PriorityCalculator&) { }
259 259
260 bool addAnimation(scoped_ptr<ActiveAnimation>); 260 bool addAnimation(scoped_ptr<Animation>);
261 void pauseAnimation(int animationId, double timeOffset); 261 void pauseAnimation(int animationId, double timeOffset);
262 void removeAnimation(int animationId); 262 void removeAnimation(int animationId);
263 263
264 void suspendAnimations(double monotonicTime); 264 void suspendAnimations(double monotonicTime);
265 void resumeAnimations(double monotonicTime); 265 void resumeAnimations(double monotonicTime);
266 266
267 LayerAnimationController* layerAnimationController() { return m_layerAnimati onController.get(); } 267 LayerAnimationController* layerAnimationController() { return m_layerAnimati onController.get(); }
268 void setLayerAnimationController(scoped_refptr<LayerAnimationController>); 268 void setLayerAnimationController(scoped_refptr<LayerAnimationController>);
269 scoped_refptr<LayerAnimationController> releaseLayerAnimationController(); 269 scoped_refptr<LayerAnimationController> releaseLayerAnimationController();
270 270
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 WebKit::WebLayerScrollClient* m_layerScrollClient; 401 WebKit::WebLayerScrollClient* m_layerScrollClient;
402 402
403 DrawProperties<Layer, RenderSurface> m_drawProperties; 403 DrawProperties<Layer, RenderSurface> m_drawProperties;
404 }; 404 };
405 405
406 void sortLayers(std::vector<scoped_refptr<Layer> >::iterator, std::vector<scoped _refptr<Layer> >::iterator, void*); 406 void sortLayers(std::vector<scoped_refptr<Layer> >::iterator, std::vector<scoped _refptr<Layer> >::iterator, void*);
407 407
408 } // namespace cc 408 } // namespace cc
409 409
410 #endif // CC_LAYER_H_ 410 #endif // CC_LAYER_H_
OLDNEW
« no previous file with comments | « cc/cc_tests.gyp ('k') | cc/layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698