| OLD | NEW |
| 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 #include "cc/layers/layer.h" | 5 #include "cc/layers/layer.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 1833 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1844 animation_id, base::TimeDelta::FromSecondsD(time_offset)); | 1844 animation_id, base::TimeDelta::FromSecondsD(time_offset)); |
| 1845 SetNeedsCommit(); | 1845 SetNeedsCommit(); |
| 1846 } | 1846 } |
| 1847 | 1847 |
| 1848 void Layer::RemoveAnimation(int animation_id) { | 1848 void Layer::RemoveAnimation(int animation_id) { |
| 1849 DCHECK(layer_animation_controller_); | 1849 DCHECK(layer_animation_controller_); |
| 1850 layer_animation_controller_->RemoveAnimation(animation_id); | 1850 layer_animation_controller_->RemoveAnimation(animation_id); |
| 1851 SetNeedsCommit(); | 1851 SetNeedsCommit(); |
| 1852 } | 1852 } |
| 1853 | 1853 |
| 1854 void Layer::RemoveAnimation(int animation_id, | |
| 1855 Animation::TargetProperty property) { | |
| 1856 DCHECK(layer_animation_controller_); | |
| 1857 layer_animation_controller_->RemoveAnimation(animation_id, property); | |
| 1858 SetNeedsCommit(); | |
| 1859 } | |
| 1860 | |
| 1861 void Layer::AbortAnimation(int animation_id) { | 1854 void Layer::AbortAnimation(int animation_id) { |
| 1862 DCHECK(layer_animation_controller_); | 1855 DCHECK(layer_animation_controller_); |
| 1863 layer_animation_controller_->AbortAnimation(animation_id); | 1856 layer_animation_controller_->AbortAnimation(animation_id); |
| 1864 SetNeedsCommit(); | 1857 SetNeedsCommit(); |
| 1865 } | 1858 } |
| 1866 | 1859 |
| 1867 void Layer::SetLayerAnimationControllerForTest( | 1860 void Layer::SetLayerAnimationControllerForTest( |
| 1868 scoped_refptr<LayerAnimationController> controller) { | 1861 scoped_refptr<LayerAnimationController> controller) { |
| 1869 DCHECK(layer_animation_controller_); | 1862 DCHECK(layer_animation_controller_); |
| 1870 layer_animation_controller_->RemoveValueObserver(this); | 1863 layer_animation_controller_->RemoveValueObserver(this); |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2032 this, layer_tree_host_->property_trees()->transform_tree); | 2025 this, layer_tree_host_->property_trees()->transform_tree); |
| 2033 } | 2026 } |
| 2034 | 2027 |
| 2035 gfx::Transform Layer::screen_space_transform() const { | 2028 gfx::Transform Layer::screen_space_transform() const { |
| 2036 DCHECK_NE(transform_tree_index_, -1); | 2029 DCHECK_NE(transform_tree_index_, -1); |
| 2037 return ScreenSpaceTransformFromPropertyTrees( | 2030 return ScreenSpaceTransformFromPropertyTrees( |
| 2038 this, layer_tree_host_->property_trees()->transform_tree); | 2031 this, layer_tree_host_->property_trees()->transform_tree); |
| 2039 } | 2032 } |
| 2040 | 2033 |
| 2041 } // namespace cc | 2034 } // namespace cc |
| OLD | NEW |