| 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 478 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 micro_benchmark_controller_.ScheduleImplBenchmarks(host_impl); | 498 micro_benchmark_controller_.ScheduleImplBenchmarks(host_impl); |
| 499 property_trees_.transform_tree.ResetChangeTracking(); | |
| 500 // We don't track changes to effect tree on main thread. But, to preserve any | 499 // We don't track changes to effect tree on main thread. But, to preserve any |
| 501 // change tracking done on active tree's effect tree, we copy it to the main | 500 // change tracking done on active tree's effect tree, we copy it to the main |
| 502 // thread's effect tree before we push the main thread property trees to | 501 // thread's effect tree before we push the main thread property trees to |
| 503 // active tree. | 502 // active tree. |
| 504 if (property_trees_changed_on_active_tree) | 503 if (property_trees_changed_on_active_tree) |
| 505 property_trees_.effect_tree.ResetChangeTracking(); | 504 property_trees_.ResetAllChangeTracking( |
| 505 PropertyTrees::ResetFlags::ALL_TREES); |
| 506 else |
| 507 property_trees_.ResetAllChangeTracking( |
| 508 PropertyTrees::ResetFlags::TRANSFORM_TREE); |
| 506 } | 509 } |
| 507 | 510 |
| 508 void LayerTreeHost::WillCommit() { | 511 void LayerTreeHost::WillCommit() { |
| 509 OnCommitForSwapPromises(); | 512 OnCommitForSwapPromises(); |
| 510 client_->WillCommit(); | 513 client_->WillCommit(); |
| 511 } | 514 } |
| 512 | 515 |
| 513 void LayerTreeHost::UpdateHudLayer() { | 516 void LayerTreeHost::UpdateHudLayer() { |
| 514 if (debug_state_.ShowHudInfo()) { | 517 if (debug_state_.ShowHudInfo()) { |
| 515 if (!hud_layer_.get()) { | 518 if (!hud_layer_.get()) { |
| (...skipping 1094 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1610 LayerTreeHostCommon::CallFunctionForSubtree( | 1613 LayerTreeHostCommon::CallFunctionForSubtree( |
| 1611 root_layer(), [seq_num](Layer* layer) { | 1614 root_layer(), [seq_num](Layer* layer) { |
| 1612 layer->set_property_tree_sequence_number(seq_num); | 1615 layer->set_property_tree_sequence_number(seq_num); |
| 1613 }); | 1616 }); |
| 1614 | 1617 |
| 1615 surface_id_namespace_ = proto.surface_id_namespace(); | 1618 surface_id_namespace_ = proto.surface_id_namespace(); |
| 1616 next_surface_sequence_ = proto.next_surface_sequence(); | 1619 next_surface_sequence_ = proto.next_surface_sequence(); |
| 1617 } | 1620 } |
| 1618 | 1621 |
| 1619 } // namespace cc | 1622 } // namespace cc |
| OLD | NEW |