| 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 <utility> | 7 #include <utility> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 return result; | 249 return result; |
| 250 } | 250 } |
| 251 | 251 |
| 252 void WebLayerImpl::removeAnimation(int animation_id) { | 252 void WebLayerImpl::removeAnimation(int animation_id) { |
| 253 layer_->RemoveAnimation(animation_id); | 253 layer_->RemoveAnimation(animation_id); |
| 254 } | 254 } |
| 255 | 255 |
| 256 void WebLayerImpl::removeAnimation( | 256 void WebLayerImpl::removeAnimation( |
| 257 int animation_id, | 257 int animation_id, |
| 258 blink::WebCompositorAnimation::TargetProperty target_property) { | 258 blink::WebCompositorAnimation::TargetProperty target_property) { |
| 259 layer_->layer_animation_controller()->RemoveAnimation( | 259 layer_->RemoveAnimation( |
| 260 animation_id, static_cast<Animation::TargetProperty>(target_property)); | 260 animation_id, static_cast<Animation::TargetProperty>(target_property)); |
| 261 } | 261 } |
| 262 | 262 |
| 263 void WebLayerImpl::pauseAnimation(int animation_id, double time_offset) { | 263 void WebLayerImpl::pauseAnimation(int animation_id, double time_offset) { |
| 264 layer_->PauseAnimation(animation_id, time_offset); | 264 layer_->PauseAnimation(animation_id, time_offset); |
| 265 } | 265 } |
| 266 | 266 |
| 267 bool WebLayerImpl::hasActiveAnimation() { | 267 bool WebLayerImpl::hasActiveAnimation() { |
| 268 return layer_->HasActiveAnimation(); | 268 return layer_->HasActiveAnimation(); |
| 269 } | 269 } |
| (...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 514 if (parent) | 514 if (parent) |
| 515 clip_parent = static_cast<WebLayerImpl*>(parent)->layer(); | 515 clip_parent = static_cast<WebLayerImpl*>(parent)->layer(); |
| 516 layer_->SetClipParent(clip_parent); | 516 layer_->SetClipParent(clip_parent); |
| 517 } | 517 } |
| 518 | 518 |
| 519 Layer* WebLayerImpl::layer() const { | 519 Layer* WebLayerImpl::layer() const { |
| 520 return layer_.get(); | 520 return layer_.get(); |
| 521 } | 521 } |
| 522 | 522 |
| 523 } // namespace cc_blink | 523 } // namespace cc_blink |
| OLD | NEW |