| 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/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
| 9 #include "cc/animation/animation_registrar.h" | 9 #include "cc/animation/animation_registrar.h" |
| 10 #include "cc/animation/scrollbar_animation_controller.h" | 10 #include "cc/animation/scrollbar_animation_controller.h" |
| (...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 687 } | 687 } |
| 688 | 688 |
| 689 void LayerImpl::OnOpacityAnimated(float opacity) { | 689 void LayerImpl::OnOpacityAnimated(float opacity) { |
| 690 SetOpacity(opacity); | 690 SetOpacity(opacity); |
| 691 } | 691 } |
| 692 | 692 |
| 693 void LayerImpl::OnTransformAnimated(const gfx::Transform& transform) { | 693 void LayerImpl::OnTransformAnimated(const gfx::Transform& transform) { |
| 694 SetTransform(transform); | 694 SetTransform(transform); |
| 695 } | 695 } |
| 696 | 696 |
| 697 void LayerImpl::OnAnimationWaitingForDeletion() {} |
| 698 |
| 697 bool LayerImpl::IsActive() const { | 699 bool LayerImpl::IsActive() const { |
| 698 return layer_tree_impl_->IsActiveTree(); | 700 return layer_tree_impl_->IsActiveTree(); |
| 699 } | 701 } |
| 700 | 702 |
| 701 void LayerImpl::SetBounds(gfx::Size bounds) { | 703 void LayerImpl::SetBounds(gfx::Size bounds) { |
| 702 if (bounds_ == bounds) | 704 if (bounds_ == bounds) |
| 703 return; | 705 return; |
| 704 | 706 |
| 705 bounds_ = bounds; | 707 bounds_ = bounds; |
| 706 | 708 |
| (...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1347 scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue()); | 1349 scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue()); |
| 1348 AsValueInto(state.get()); | 1350 AsValueInto(state.get()); |
| 1349 return state.PassAs<base::Value>(); | 1351 return state.PassAs<base::Value>(); |
| 1350 } | 1352 } |
| 1351 | 1353 |
| 1352 void LayerImpl::RunMicroBenchmark(MicroBenchmarkImpl* benchmark) { | 1354 void LayerImpl::RunMicroBenchmark(MicroBenchmarkImpl* benchmark) { |
| 1353 benchmark->RunOnLayer(this); | 1355 benchmark->RunOnLayer(this); |
| 1354 } | 1356 } |
| 1355 | 1357 |
| 1356 } // namespace cc | 1358 } // namespace cc |
| OLD | NEW |