| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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/trees/layer_tree_host.h" | 5 #include "cc/trees/layer_tree_host.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 1022 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1033 TRACE_EVENT0("cc", "LayerTreeHostImpl::AnimateLayers"); | 1033 TRACE_EVENT0("cc", "LayerTreeHostImpl::AnimateLayers"); |
| 1034 | 1034 |
| 1035 double monotonic_time = (time - base::TimeTicks()).InSecondsF(); | 1035 double monotonic_time = (time - base::TimeTicks()).InSecondsF(); |
| 1036 | 1036 |
| 1037 AnimationRegistrar::AnimationControllerMap copy = | 1037 AnimationRegistrar::AnimationControllerMap copy = |
| 1038 animation_registrar_->active_animation_controllers(); | 1038 animation_registrar_->active_animation_controllers(); |
| 1039 for (AnimationRegistrar::AnimationControllerMap::iterator iter = copy.begin(); | 1039 for (AnimationRegistrar::AnimationControllerMap::iterator iter = copy.begin(); |
| 1040 iter != copy.end(); | 1040 iter != copy.end(); |
| 1041 ++iter) { | 1041 ++iter) { |
| 1042 (*iter).second->Animate(monotonic_time); | 1042 (*iter).second->Animate(monotonic_time); |
| 1043 (*iter).second->UpdateState(NULL); | 1043 bool start_ready_animations = true; |
| 1044 (*iter).second->UpdateState(start_ready_animations, NULL); |
| 1044 } | 1045 } |
| 1045 } | 1046 } |
| 1046 | 1047 |
| 1047 void LayerTreeHost::SetAnimationEventsRecursive( | 1048 void LayerTreeHost::SetAnimationEventsRecursive( |
| 1048 const AnimationEventsVector& events, | 1049 const AnimationEventsVector& events, |
| 1049 Layer* layer, | 1050 Layer* layer, |
| 1050 base::Time wall_clock_time) { | 1051 base::Time wall_clock_time) { |
| 1051 if (!layer) | 1052 if (!layer) |
| 1052 return; | 1053 return; |
| 1053 | 1054 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 1079 SetAnimationEventsRecursive(events, | 1080 SetAnimationEventsRecursive(events, |
| 1080 layer->children()[child_index].get(), | 1081 layer->children()[child_index].get(), |
| 1081 wall_clock_time); | 1082 wall_clock_time); |
| 1082 } | 1083 } |
| 1083 | 1084 |
| 1084 skia::RefPtr<SkPicture> LayerTreeHost::CapturePicture() { | 1085 skia::RefPtr<SkPicture> LayerTreeHost::CapturePicture() { |
| 1085 return proxy_->CapturePicture(); | 1086 return proxy_->CapturePicture(); |
| 1086 } | 1087 } |
| 1087 | 1088 |
| 1088 } // namespace cc | 1089 } // namespace cc |
| OLD | NEW |