Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(143)

Side by Side Diff: cc/trees/layer_tree_host.cc

Issue 2017263002: cc: Move copy requests from layers to the effect tree (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix typo in comment Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/trees/draw_property_utils.cc ('k') | cc/trees/layer_tree_host_common.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 // status by pushing the damage status from sync tree property trees to main 469 // status by pushing the damage status from sync tree property trees to main
470 // thread property trees or by moving it onto the layers. 470 // thread property trees or by moving it onto the layers.
471 if (root_layer_ && property_trees_changed_on_active_tree) { 471 if (root_layer_ && property_trees_changed_on_active_tree) {
472 if (property_trees_.sequence_number == 472 if (property_trees_.sequence_number ==
473 sync_tree->property_trees()->sequence_number) 473 sync_tree->property_trees()->sequence_number)
474 sync_tree->property_trees()->PushChangeTrackingTo(&property_trees_); 474 sync_tree->property_trees()->PushChangeTrackingTo(&property_trees_);
475 else 475 else
476 sync_tree->MoveChangeTrackingToLayers(); 476 sync_tree->MoveChangeTrackingToLayers();
477 } 477 }
478 // Setting property trees must happen before pushing the page scale. 478 // Setting property trees must happen before pushing the page scale.
479 sync_tree->SetPropertyTrees(property_trees_); 479 sync_tree->SetPropertyTrees(&property_trees_);
480 480
481 sync_tree->PushPageScaleFromMainThread( 481 sync_tree->PushPageScaleFromMainThread(
482 page_scale_factor_, min_page_scale_factor_, max_page_scale_factor_); 482 page_scale_factor_, min_page_scale_factor_, max_page_scale_factor_);
483 sync_tree->elastic_overscroll()->PushFromMainThread(elastic_overscroll_); 483 sync_tree->elastic_overscroll()->PushFromMainThread(elastic_overscroll_);
484 if (sync_tree->IsActiveTree()) 484 if (sync_tree->IsActiveTree())
485 sync_tree->elastic_overscroll()->PushPendingToActive(); 485 sync_tree->elastic_overscroll()->PushPendingToActive();
486 486
487 sync_tree->PassSwapPromises(&swap_promise_list_); 487 sync_tree->PassSwapPromises(&swap_promise_list_);
488 488
489 sync_tree->set_top_controls_shrink_blink_size( 489 sync_tree->set_top_controls_shrink_blink_size(
(...skipping 1187 matching lines...) Expand 10 before | Expand all | Expand 10 after
1677 int seq_num = property_trees_.sequence_number; 1677 int seq_num = property_trees_.sequence_number;
1678 LayerTreeHostCommon::CallFunctionForEveryLayer(this, [seq_num](Layer* layer) { 1678 LayerTreeHostCommon::CallFunctionForEveryLayer(this, [seq_num](Layer* layer) {
1679 layer->set_property_tree_sequence_number(seq_num); 1679 layer->set_property_tree_sequence_number(seq_num);
1680 }); 1680 });
1681 1681
1682 surface_id_namespace_ = proto.surface_id_namespace(); 1682 surface_id_namespace_ = proto.surface_id_namespace();
1683 next_surface_sequence_ = proto.next_surface_sequence(); 1683 next_surface_sequence_ = proto.next_surface_sequence();
1684 } 1684 }
1685 1685
1686 } // namespace cc 1686 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/draw_property_utils.cc ('k') | cc/trees/layer_tree_host_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698