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

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

Issue 1736073002: cc: Move SyncedScrollOffset to scroll tree (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolve comments Created 4 years, 9 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/property_tree_builder.h" 5 #include "cc/trees/property_tree_builder.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 node.data.element_id = layer->element_id(); 706 node.data.element_id = layer->element_id();
707 node.data.transform_id = 707 node.data.transform_id =
708 data_for_children->transform_tree_parent->transform_tree_index(); 708 data_for_children->transform_tree_parent->transform_tree_index();
709 709
710 data_for_children->scroll_tree_parent = 710 data_for_children->scroll_tree_parent =
711 data_for_children->scroll_tree->Insert(node, parent_id); 711 data_for_children->scroll_tree->Insert(node, parent_id);
712 data_for_children->main_thread_scrolling_reasons = 712 data_for_children->main_thread_scrolling_reasons =
713 node.data.main_thread_scrolling_reasons; 713 node.data.main_thread_scrolling_reasons;
714 data_for_children->scroll_tree_parent_created_by_uninheritable_criteria = 714 data_for_children->scroll_tree_parent_created_by_uninheritable_criteria =
715 scroll_node_uninheritable_criteria; 715 scroll_node_uninheritable_criteria;
716
717 if (node.data.scrollable) {
718 data_for_children->scroll_tree->synced_scroll_offset(layer->id())
719 ->PushFromMainThread(layer->scroll_offset());
720 }
716 } 721 }
717 722
718 layer->SetScrollTreeIndex(data_for_children->scroll_tree_parent); 723 layer->SetScrollTreeIndex(data_for_children->scroll_tree_parent);
719 } 724 }
720 725
721 template <typename LayerType> 726 template <typename LayerType>
722 void SetBackfaceVisibilityTransform(LayerType* layer, 727 void SetBackfaceVisibilityTransform(LayerType* layer,
723 bool created_transform_node) { 728 bool created_transform_node) {
724 const bool is_at_boundary_of_3d_rendering_context = 729 const bool is_at_boundary_of_3d_rendering_context =
725 IsAtBoundaryOf3dRenderingContext(layer); 730 IsAtBoundaryOf3dRenderingContext(layer);
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
933 const Layer* page_scale_layer, 938 const Layer* page_scale_layer,
934 const Layer* inner_viewport_scroll_layer, 939 const Layer* inner_viewport_scroll_layer,
935 const Layer* outer_viewport_scroll_layer, 940 const Layer* outer_viewport_scroll_layer,
936 const Layer* overscroll_elasticity_layer, 941 const Layer* overscroll_elasticity_layer,
937 const gfx::Vector2dF& elastic_overscroll, 942 const gfx::Vector2dF& elastic_overscroll,
938 float page_scale_factor, 943 float page_scale_factor,
939 float device_scale_factor, 944 float device_scale_factor,
940 const gfx::Rect& viewport, 945 const gfx::Rect& viewport,
941 const gfx::Transform& device_transform, 946 const gfx::Transform& device_transform,
942 PropertyTrees* property_trees) { 947 PropertyTrees* property_trees) {
948 property_trees->is_main_thread = true;
949 property_trees->is_active = false;
943 BuildPropertyTreesTopLevelInternal( 950 BuildPropertyTreesTopLevelInternal(
944 root_layer, page_scale_layer, inner_viewport_scroll_layer, 951 root_layer, page_scale_layer, inner_viewport_scroll_layer,
945 outer_viewport_scroll_layer, overscroll_elasticity_layer, 952 outer_viewport_scroll_layer, overscroll_elasticity_layer,
946 elastic_overscroll, page_scale_factor, device_scale_factor, viewport, 953 elastic_overscroll, page_scale_factor, device_scale_factor, viewport,
947 device_transform, property_trees); 954 device_transform, property_trees);
948 } 955 }
949 956
950 void PropertyTreeBuilder::BuildPropertyTrees( 957 void PropertyTreeBuilder::BuildPropertyTrees(
951 LayerImpl* root_layer, 958 LayerImpl* root_layer,
952 const LayerImpl* page_scale_layer, 959 const LayerImpl* page_scale_layer,
953 const LayerImpl* inner_viewport_scroll_layer, 960 const LayerImpl* inner_viewport_scroll_layer,
954 const LayerImpl* outer_viewport_scroll_layer, 961 const LayerImpl* outer_viewport_scroll_layer,
955 const LayerImpl* overscroll_elasticity_layer, 962 const LayerImpl* overscroll_elasticity_layer,
956 const gfx::Vector2dF& elastic_overscroll, 963 const gfx::Vector2dF& elastic_overscroll,
957 float page_scale_factor, 964 float page_scale_factor,
958 float device_scale_factor, 965 float device_scale_factor,
959 const gfx::Rect& viewport, 966 const gfx::Rect& viewport,
960 const gfx::Transform& device_transform, 967 const gfx::Transform& device_transform,
961 PropertyTrees* property_trees) { 968 PropertyTrees* property_trees) {
969 property_trees->is_main_thread = false;
970 property_trees->is_active = root_layer->IsActive();
962 BuildPropertyTreesTopLevelInternal( 971 BuildPropertyTreesTopLevelInternal(
963 root_layer, page_scale_layer, inner_viewport_scroll_layer, 972 root_layer, page_scale_layer, inner_viewport_scroll_layer,
964 outer_viewport_scroll_layer, overscroll_elasticity_layer, 973 outer_viewport_scroll_layer, overscroll_elasticity_layer,
965 elastic_overscroll, page_scale_factor, device_scale_factor, viewport, 974 elastic_overscroll, page_scale_factor, device_scale_factor, viewport,
966 device_transform, property_trees); 975 device_transform, property_trees);
967 } 976 }
968 977
969 } // namespace cc 978 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698