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

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: Rebase and add comment 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
« no previous file with comments | « cc/trees/property_tree.cc ('k') | cc/trees/property_tree_unittest.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 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 697 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 node.data.element_id = layer->element_id(); 708 node.data.element_id = layer->element_id();
709 node.data.transform_id = 709 node.data.transform_id =
710 data_for_children->transform_tree_parent->transform_tree_index(); 710 data_for_children->transform_tree_parent->transform_tree_index();
711 711
712 data_for_children->scroll_tree_parent = 712 data_for_children->scroll_tree_parent =
713 data_for_children->scroll_tree->Insert(node, parent_id); 713 data_for_children->scroll_tree->Insert(node, parent_id);
714 data_for_children->main_thread_scrolling_reasons = 714 data_for_children->main_thread_scrolling_reasons =
715 node.data.main_thread_scrolling_reasons; 715 node.data.main_thread_scrolling_reasons;
716 data_for_children->scroll_tree_parent_created_by_uninheritable_criteria = 716 data_for_children->scroll_tree_parent_created_by_uninheritable_criteria =
717 scroll_node_uninheritable_criteria; 717 scroll_node_uninheritable_criteria;
718
719 if (node.data.scrollable) {
720 data_for_children->scroll_tree->synced_scroll_offset(layer->id())
721 ->PushFromMainThread(layer->CurrentScrollOffset());
722 }
718 } 723 }
719 724
720 layer->SetScrollTreeIndex(data_for_children->scroll_tree_parent); 725 layer->SetScrollTreeIndex(data_for_children->scroll_tree_parent);
721 } 726 }
722 727
723 template <typename LayerType> 728 template <typename LayerType>
724 void SetBackfaceVisibilityTransform(LayerType* layer, 729 void SetBackfaceVisibilityTransform(LayerType* layer,
725 bool created_transform_node) { 730 bool created_transform_node) {
726 const bool is_at_boundary_of_3d_rendering_context = 731 const bool is_at_boundary_of_3d_rendering_context =
727 IsAtBoundaryOf3dRenderingContext(layer); 732 IsAtBoundaryOf3dRenderingContext(layer);
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
952 const Layer* page_scale_layer, 957 const Layer* page_scale_layer,
953 const Layer* inner_viewport_scroll_layer, 958 const Layer* inner_viewport_scroll_layer,
954 const Layer* outer_viewport_scroll_layer, 959 const Layer* outer_viewport_scroll_layer,
955 const Layer* overscroll_elasticity_layer, 960 const Layer* overscroll_elasticity_layer,
956 const gfx::Vector2dF& elastic_overscroll, 961 const gfx::Vector2dF& elastic_overscroll,
957 float page_scale_factor, 962 float page_scale_factor,
958 float device_scale_factor, 963 float device_scale_factor,
959 const gfx::Rect& viewport, 964 const gfx::Rect& viewport,
960 const gfx::Transform& device_transform, 965 const gfx::Transform& device_transform,
961 PropertyTrees* property_trees) { 966 PropertyTrees* property_trees) {
967 property_trees->is_main_thread = true;
968 property_trees->is_active = false;
962 SkColor color = root_layer->layer_tree_host()->background_color(); 969 SkColor color = root_layer->layer_tree_host()->background_color();
963 if (SkColorGetA(color) != 255) 970 if (SkColorGetA(color) != 255)
964 color = SkColorSetA(color, 255); 971 color = SkColorSetA(color, 255);
965 BuildPropertyTreesTopLevelInternal( 972 BuildPropertyTreesTopLevelInternal(
966 root_layer, page_scale_layer, inner_viewport_scroll_layer, 973 root_layer, page_scale_layer, inner_viewport_scroll_layer,
967 outer_viewport_scroll_layer, overscroll_elasticity_layer, 974 outer_viewport_scroll_layer, overscroll_elasticity_layer,
968 elastic_overscroll, page_scale_factor, device_scale_factor, viewport, 975 elastic_overscroll, page_scale_factor, device_scale_factor, viewport,
969 device_transform, property_trees, color); 976 device_transform, property_trees, color);
970 } 977 }
971 978
972 void PropertyTreeBuilder::BuildPropertyTrees( 979 void PropertyTreeBuilder::BuildPropertyTrees(
973 LayerImpl* root_layer, 980 LayerImpl* root_layer,
974 const LayerImpl* page_scale_layer, 981 const LayerImpl* page_scale_layer,
975 const LayerImpl* inner_viewport_scroll_layer, 982 const LayerImpl* inner_viewport_scroll_layer,
976 const LayerImpl* outer_viewport_scroll_layer, 983 const LayerImpl* outer_viewport_scroll_layer,
977 const LayerImpl* overscroll_elasticity_layer, 984 const LayerImpl* overscroll_elasticity_layer,
978 const gfx::Vector2dF& elastic_overscroll, 985 const gfx::Vector2dF& elastic_overscroll,
979 float page_scale_factor, 986 float page_scale_factor,
980 float device_scale_factor, 987 float device_scale_factor,
981 const gfx::Rect& viewport, 988 const gfx::Rect& viewport,
982 const gfx::Transform& device_transform, 989 const gfx::Transform& device_transform,
983 PropertyTrees* property_trees) { 990 PropertyTrees* property_trees) {
991 property_trees->is_main_thread = false;
992 property_trees->is_active = root_layer->IsActive();
984 SkColor color = root_layer->layer_tree_impl()->background_color(); 993 SkColor color = root_layer->layer_tree_impl()->background_color();
985 if (SkColorGetA(color) != 255) 994 if (SkColorGetA(color) != 255)
986 color = SkColorSetA(color, 255); 995 color = SkColorSetA(color, 255);
987 BuildPropertyTreesTopLevelInternal( 996 BuildPropertyTreesTopLevelInternal(
988 root_layer, page_scale_layer, inner_viewport_scroll_layer, 997 root_layer, page_scale_layer, inner_viewport_scroll_layer,
989 outer_viewport_scroll_layer, overscroll_elasticity_layer, 998 outer_viewport_scroll_layer, overscroll_elasticity_layer,
990 elastic_overscroll, page_scale_factor, device_scale_factor, viewport, 999 elastic_overscroll, page_scale_factor, device_scale_factor, viewport,
991 device_transform, property_trees, color); 1000 device_transform, property_trees, color);
992 } 1001 }
993 1002
994 } // namespace cc 1003 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/property_tree.cc ('k') | cc/trees/property_tree_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698