| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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/trees/layer_tree_host.h" | 5 #include "cc/trees/layer_tree_host.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 517 | 517 |
| 518 sync_tree->set_has_ever_been_drawn(false); | 518 sync_tree->set_has_ever_been_drawn(false); |
| 519 | 519 |
| 520 { | 520 { |
| 521 TRACE_EVENT0("cc", "LayerTreeHost::PushProperties"); | 521 TRACE_EVENT0("cc", "LayerTreeHost::PushProperties"); |
| 522 | 522 |
| 523 TreeSynchronizer::PushLayerProperties(this, sync_tree); | 523 TreeSynchronizer::PushLayerProperties(this, sync_tree); |
| 524 | 524 |
| 525 TRACE_EVENT0("cc", "LayerTreeHost::AnimationHost::PushProperties"); | 525 TRACE_EVENT0("cc", "LayerTreeHost::AnimationHost::PushProperties"); |
| 526 DCHECK(host_impl->animation_host()); | 526 DCHECK(host_impl->animation_host()); |
| 527 animation_host_->PushPropertiesTo(host_impl->animation_host()); | 527 animation_host_->PushPropertiesTo( |
| 528 host_impl->animation_host(), |
| 529 host_impl->CurrentBeginFrameArgs().frame_time); |
| 528 } | 530 } |
| 529 | 531 |
| 530 // This must happen after synchronizing property trees and after push | 532 // This must happen after synchronizing property trees and after push |
| 531 // properties, which updates property tree indices. | 533 // properties, which updates property tree indices. |
| 532 sync_tree->UpdatePropertyTreeScrollingAndAnimationFromMainThread(); | 534 sync_tree->UpdatePropertyTreeScrollingAndAnimationFromMainThread(); |
| 533 | 535 |
| 534 // This must happen after synchronizing property trees and after pushing | 536 // This must happen after synchronizing property trees and after pushing |
| 535 // properties, which updates the clobber_active_value flag. | 537 // properties, which updates the clobber_active_value flag. |
| 536 sync_tree->UpdatePropertyTreeScrollOffset(&property_trees_); | 538 sync_tree->UpdatePropertyTreeScrollOffset(&property_trees_); |
| 537 | 539 |
| (...skipping 1123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1661 int seq_num = property_trees_.sequence_number; | 1663 int seq_num = property_trees_.sequence_number; |
| 1662 LayerTreeHostCommon::CallFunctionForEveryLayer(this, [seq_num](Layer* layer) { | 1664 LayerTreeHostCommon::CallFunctionForEveryLayer(this, [seq_num](Layer* layer) { |
| 1663 layer->set_property_tree_sequence_number(seq_num); | 1665 layer->set_property_tree_sequence_number(seq_num); |
| 1664 }); | 1666 }); |
| 1665 | 1667 |
| 1666 surface_id_namespace_ = proto.surface_id_namespace(); | 1668 surface_id_namespace_ = proto.surface_id_namespace(); |
| 1667 next_surface_sequence_ = proto.next_surface_sequence(); | 1669 next_surface_sequence_ = proto.next_surface_sequence(); |
| 1668 } | 1670 } |
| 1669 | 1671 |
| 1670 } // namespace cc | 1672 } // namespace cc |
| OLD | NEW |