| 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 477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 488 TRACE_EVENT0("cc", "LayerTreeHost::AnimationHost::PushProperties"); | 488 TRACE_EVENT0("cc", "LayerTreeHost::AnimationHost::PushProperties"); |
| 489 DCHECK(host_impl->animation_host()); | 489 DCHECK(host_impl->animation_host()); |
| 490 animation_host_->PushPropertiesTo(host_impl->animation_host()); | 490 animation_host_->PushPropertiesTo(host_impl->animation_host()); |
| 491 } | 491 } |
| 492 } | 492 } |
| 493 | 493 |
| 494 // This must happen after synchronizing property trees and after push | 494 // This must happen after synchronizing property trees and after push |
| 495 // properties, which updates property tree indices. | 495 // properties, which updates property tree indices. |
| 496 sync_tree->UpdatePropertyTreeScrollingAndAnimationFromMainThread(); | 496 sync_tree->UpdatePropertyTreeScrollingAndAnimationFromMainThread(); |
| 497 | 497 |
| 498 // This must happen after synchronizing property trees and after pushing |
| 499 // properties, which updates the clobber_active_value flag. |
| 500 sync_tree->UpdatePropertyTreeScrollOffset(&property_trees_); |
| 501 |
| 498 micro_benchmark_controller_.ScheduleImplBenchmarks(host_impl); | 502 micro_benchmark_controller_.ScheduleImplBenchmarks(host_impl); |
| 499 // We don't track changes to effect tree on main thread. But, to preserve any | 503 // We don't track changes to effect tree on main thread. But, to preserve any |
| 500 // change tracking done on active tree's effect tree, we copy it to the main | 504 // change tracking done on active tree's effect tree, we copy it to the main |
| 501 // thread's effect tree before we push the main thread property trees to | 505 // thread's effect tree before we push the main thread property trees to |
| 502 // active tree. | 506 // active tree. |
| 503 if (property_trees_changed_on_active_tree) | 507 if (property_trees_changed_on_active_tree) |
| 504 property_trees_.ResetAllChangeTracking( | 508 property_trees_.ResetAllChangeTracking( |
| 505 PropertyTrees::ResetFlags::ALL_TREES); | 509 PropertyTrees::ResetFlags::ALL_TREES); |
| 506 else | 510 else |
| 507 property_trees_.ResetAllChangeTracking( | 511 property_trees_.ResetAllChangeTracking( |
| (...skipping 1105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1613 LayerTreeHostCommon::CallFunctionForSubtree( | 1617 LayerTreeHostCommon::CallFunctionForSubtree( |
| 1614 root_layer(), [seq_num](Layer* layer) { | 1618 root_layer(), [seq_num](Layer* layer) { |
| 1615 layer->set_property_tree_sequence_number(seq_num); | 1619 layer->set_property_tree_sequence_number(seq_num); |
| 1616 }); | 1620 }); |
| 1617 | 1621 |
| 1618 surface_id_namespace_ = proto.surface_id_namespace(); | 1622 surface_id_namespace_ = proto.surface_id_namespace(); |
| 1619 next_surface_sequence_ = proto.next_surface_sequence(); | 1623 next_surface_sequence_ = proto.next_surface_sequence(); |
| 1620 } | 1624 } |
| 1621 | 1625 |
| 1622 } // namespace cc | 1626 } // namespace cc |
| OLD | NEW |