| 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 <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| (...skipping 1048 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1059 } | 1059 } |
| 1060 | 1060 |
| 1061 void Layer::OnOpacityAnimated(float opacity) { | 1061 void Layer::OnOpacityAnimated(float opacity) { |
| 1062 opacity_ = opacity; | 1062 opacity_ = opacity; |
| 1063 } | 1063 } |
| 1064 | 1064 |
| 1065 void Layer::OnTransformAnimated(const gfx::Transform& transform) { | 1065 void Layer::OnTransformAnimated(const gfx::Transform& transform) { |
| 1066 transform_ = transform; | 1066 transform_ = transform; |
| 1067 } | 1067 } |
| 1068 | 1068 |
| 1069 void Layer::OnScrollOffsetAnimated(gfx::Vector2dF scroll_offset) { | 1069 void Layer::OnScrollOffsetAnimated(const gfx::Vector2dF& scroll_offset) { |
| 1070 // Do nothing. Scroll deltas will be sent from the compositor thread back | 1070 // Do nothing. Scroll deltas will be sent from the compositor thread back |
| 1071 // to the main thread in the same manner as during non-animated | 1071 // to the main thread in the same manner as during non-animated |
| 1072 // compositor-driven scrolling. | 1072 // compositor-driven scrolling. |
| 1073 } | 1073 } |
| 1074 | 1074 |
| 1075 void Layer::OnAnimationWaitingForDeletion() { | 1075 void Layer::OnAnimationWaitingForDeletion() { |
| 1076 // Animations are only deleted during PushProperties. | 1076 // Animations are only deleted during PushProperties. |
| 1077 SetNeedsPushProperties(); | 1077 SetNeedsPushProperties(); |
| 1078 } | 1078 } |
| 1079 | 1079 |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1166 clip_parent_->RemoveClipChild(this); | 1166 clip_parent_->RemoveClipChild(this); |
| 1167 | 1167 |
| 1168 clip_parent_ = NULL; | 1168 clip_parent_ = NULL; |
| 1169 } | 1169 } |
| 1170 | 1170 |
| 1171 void Layer::RunMicroBenchmark(MicroBenchmark* benchmark) { | 1171 void Layer::RunMicroBenchmark(MicroBenchmark* benchmark) { |
| 1172 benchmark->RunOnLayer(this); | 1172 benchmark->RunOnLayer(this); |
| 1173 } | 1173 } |
| 1174 | 1174 |
| 1175 } // namespace cc | 1175 } // namespace cc |
| OLD | NEW |