| OLD | NEW |
| 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 #include "cc/layers/layer_impl.h" | 5 #include "cc/layers/layer_impl.h" |
| 6 | 6 |
| 7 #include "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
| 8 #include "base/debug/trace_event_argument.h" | 8 #include "base/debug/trace_event_argument.h" |
| 9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
| 10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
| (...skipping 1543 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1554 void LayerImpl::RunMicroBenchmark(MicroBenchmarkImpl* benchmark) { | 1554 void LayerImpl::RunMicroBenchmark(MicroBenchmarkImpl* benchmark) { |
| 1555 benchmark->RunOnLayer(this); | 1555 benchmark->RunOnLayer(this); |
| 1556 } | 1556 } |
| 1557 | 1557 |
| 1558 int LayerImpl::NumDescendantsThatDrawContent() const { | 1558 int LayerImpl::NumDescendantsThatDrawContent() const { |
| 1559 return num_descendants_that_draw_content_; | 1559 return num_descendants_that_draw_content_; |
| 1560 } | 1560 } |
| 1561 | 1561 |
| 1562 void LayerImpl::NotifyAnimationFinished( | 1562 void LayerImpl::NotifyAnimationFinished( |
| 1563 base::TimeTicks monotonic_time, | 1563 base::TimeTicks monotonic_time, |
| 1564 Animation::TargetProperty target_property) { | 1564 Animation::TargetProperty target_property, |
| 1565 int group) { |
| 1565 if (target_property == Animation::ScrollOffset) | 1566 if (target_property == Animation::ScrollOffset) |
| 1566 layer_tree_impl_->InputScrollAnimationFinished(); | 1567 layer_tree_impl_->InputScrollAnimationFinished(); |
| 1567 } | 1568 } |
| 1568 | 1569 |
| 1569 } // namespace cc | 1570 } // namespace cc |
| OLD | NEW |