| 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 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 375 | 375 |
| 376 DCHECK(!sync_tree->ViewportSizeInvalid()); | 376 DCHECK(!sync_tree->ViewportSizeInvalid()); |
| 377 | 377 |
| 378 sync_tree->set_has_ever_been_drawn(false); | 378 sync_tree->set_has_ever_been_drawn(false); |
| 379 | 379 |
| 380 { | 380 { |
| 381 TRACE_EVENT0("cc", "LayerTreeHost::PushProperties"); | 381 TRACE_EVENT0("cc", "LayerTreeHost::PushProperties"); |
| 382 TreeSynchronizer::PushProperties(root_layer(), sync_tree->root_layer()); | 382 TreeSynchronizer::PushProperties(root_layer(), sync_tree->root_layer()); |
| 383 | 383 |
| 384 if (animation_host_) { | 384 if (animation_host_) { |
| 385 TRACE_EVENT0("cc", "LayerTreeHost::AnimationHost::PushProperties"); |
| 385 DCHECK(host_impl->animation_host()); | 386 DCHECK(host_impl->animation_host()); |
| 386 animation_host_->PushPropertiesTo(host_impl->animation_host()); | 387 animation_host_->PushPropertiesTo(host_impl->animation_host()); |
| 387 } | 388 } |
| 388 } | 389 } |
| 389 | 390 |
| 390 // This must happen after synchronizing property trees and after push | 391 // This must happen after synchronizing property trees and after push |
| 391 // properties, which updates property tree indices. | 392 // properties, which updates property tree indices. |
| 392 sync_tree->UpdatePropertyTreeScrollingAndAnimationFromMainThread(); | 393 sync_tree->UpdatePropertyTreeScrollingAndAnimationFromMainThread(); |
| 393 | 394 |
| 394 micro_benchmark_controller_.ScheduleImplBenchmarks(host_impl); | 395 micro_benchmark_controller_.ScheduleImplBenchmarks(host_impl); |
| (...skipping 1040 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1435 | 1436 |
| 1436 // It is required to create new PropertyTrees before deserializing it. | 1437 // It is required to create new PropertyTrees before deserializing it. |
| 1437 property_trees_ = PropertyTrees(); | 1438 property_trees_ = PropertyTrees(); |
| 1438 property_trees_.FromProtobuf(proto.property_trees()); | 1439 property_trees_.FromProtobuf(proto.property_trees()); |
| 1439 | 1440 |
| 1440 surface_id_namespace_ = proto.surface_id_namespace(); | 1441 surface_id_namespace_ = proto.surface_id_namespace(); |
| 1441 next_surface_sequence_ = proto.next_surface_sequence(); | 1442 next_surface_sequence_ = proto.next_surface_sequence(); |
| 1442 } | 1443 } |
| 1443 | 1444 |
| 1444 } // namespace cc | 1445 } // namespace cc |
| OLD | NEW |