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 #include <stack> | 8 #include <stack> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
588 case AnimationEvent::Started: | 588 case AnimationEvent::Started: |
589 (*iter).second->NotifyAnimationStarted((*events)[event_index], | 589 (*iter).second->NotifyAnimationStarted((*events)[event_index], |
590 wall_clock_time.ToDoubleT()); | 590 wall_clock_time.ToDoubleT()); |
591 break; | 591 break; |
592 | 592 |
593 case AnimationEvent::Finished: | 593 case AnimationEvent::Finished: |
594 (*iter).second->NotifyAnimationFinished((*events)[event_index], | 594 (*iter).second->NotifyAnimationFinished((*events)[event_index], |
595 wall_clock_time.ToDoubleT()); | 595 wall_clock_time.ToDoubleT()); |
596 break; | 596 break; |
597 | 597 |
| 598 case AnimationEvent::Aborted: |
| 599 (*iter).second->NotifyAnimationAborted((*events)[event_index]); |
| 600 break; |
| 601 |
598 case AnimationEvent::PropertyUpdate: | 602 case AnimationEvent::PropertyUpdate: |
599 (*iter).second->NotifyAnimationPropertyUpdate((*events)[event_index]); | 603 (*iter).second->NotifyAnimationPropertyUpdate((*events)[event_index]); |
600 break; | 604 break; |
601 } | 605 } |
602 } | 606 } |
603 } | 607 } |
604 } | 608 } |
605 | 609 |
606 void LayerTreeHost::SetRootLayer(scoped_refptr<Layer> root_layer) { | 610 void LayerTreeHost::SetRootLayer(scoped_refptr<Layer> root_layer) { |
607 if (root_layer_.get() == root_layer.get()) | 611 if (root_layer_.get() == root_layer.get()) |
(...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1258 | 1262 |
1259 bool LayerTreeHost::ScheduleMicroBenchmark( | 1263 bool LayerTreeHost::ScheduleMicroBenchmark( |
1260 const std::string& benchmark_name, | 1264 const std::string& benchmark_name, |
1261 scoped_ptr<base::Value> value, | 1265 scoped_ptr<base::Value> value, |
1262 const MicroBenchmark::DoneCallback& callback) { | 1266 const MicroBenchmark::DoneCallback& callback) { |
1263 return micro_benchmark_controller_.ScheduleRun( | 1267 return micro_benchmark_controller_.ScheduleRun( |
1264 benchmark_name, value.Pass(), callback); | 1268 benchmark_name, value.Pass(), callback); |
1265 } | 1269 } |
1266 | 1270 |
1267 } // namespace cc | 1271 } // namespace cc |
OLD | NEW |