OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/blink/web_layer_impl.h" | 5 #include "cc/blink/web_layer_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <utility> | 10 #include <utility> |
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
258 bool result = layer_->AddAnimation( | 258 bool result = layer_->AddAnimation( |
259 static_cast<WebCompositorAnimationImpl*>(animation)->PassAnimation()); | 259 static_cast<WebCompositorAnimationImpl*>(animation)->PassAnimation()); |
260 delete animation; | 260 delete animation; |
261 return result; | 261 return result; |
262 } | 262 } |
263 | 263 |
264 void WebLayerImpl::removeAnimation(int animation_id) { | 264 void WebLayerImpl::removeAnimation(int animation_id) { |
265 layer_->RemoveAnimation(animation_id); | 265 layer_->RemoveAnimation(animation_id); |
266 } | 266 } |
267 | 267 |
268 void WebLayerImpl::removeAnimation( | |
269 int animation_id, | |
270 blink::WebCompositorAnimation::TargetProperty target_property) { | |
271 layer_->RemoveAnimation( | |
272 animation_id, static_cast<Animation::TargetProperty>(target_property)); | |
273 } | |
274 | |
275 void WebLayerImpl::pauseAnimation(int animation_id, double time_offset) { | 268 void WebLayerImpl::pauseAnimation(int animation_id, double time_offset) { |
276 layer_->PauseAnimation(animation_id, time_offset); | 269 layer_->PauseAnimation(animation_id, time_offset); |
277 } | 270 } |
278 | 271 |
279 void WebLayerImpl::abortAnimation(int animation_id) { | 272 void WebLayerImpl::abortAnimation(int animation_id) { |
280 layer_->AbortAnimation(animation_id); | 273 layer_->AbortAnimation(animation_id); |
281 } | 274 } |
282 | 275 |
283 bool WebLayerImpl::hasActiveAnimation() { | 276 bool WebLayerImpl::hasActiveAnimation() { |
284 return layer_->HasActiveAnimation(); | 277 return layer_->HasActiveAnimation(); |
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
549 | 542 |
550 Layer* WebLayerImpl::layer() const { | 543 Layer* WebLayerImpl::layer() const { |
551 return layer_.get(); | 544 return layer_.get(); |
552 } | 545 } |
553 | 546 |
554 void WebLayerImpl::SetContentsOpaqueIsFixed(bool fixed) { | 547 void WebLayerImpl::SetContentsOpaqueIsFixed(bool fixed) { |
555 contents_opaque_is_fixed_ = fixed; | 548 contents_opaque_is_fixed_ = fixed; |
556 } | 549 } |
557 | 550 |
558 } // namespace cc_blink | 551 } // namespace cc_blink |
OLD | NEW |