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

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

Issue 2183403002: cc: Move data to LayerTree from LayerTreeHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@layer_tree_change
Patch Set: Missed one test. Created 4 years, 4 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 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_common.h" 5 #include "cc/trees/layer_tree_host_common.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 // A root layer render_surface should always exist after 610 // A root layer render_surface should always exist after
611 // CalculateDrawProperties. 611 // CalculateDrawProperties.
612 DCHECK(inputs->root_layer->render_surface()); 612 DCHECK(inputs->root_layer->render_surface());
613 } 613 }
614 614
615 void LayerTreeHostCommon::CalculateDrawPropertiesForTesting( 615 void LayerTreeHostCommon::CalculateDrawPropertiesForTesting(
616 CalcDrawPropsMainInputsForTesting* inputs) { 616 CalcDrawPropsMainInputsForTesting* inputs) {
617 LayerList update_layer_list; 617 LayerList update_layer_list;
618 bool can_render_to_separate_surface = true; 618 bool can_render_to_separate_surface = true;
619 PropertyTrees* property_trees = 619 PropertyTrees* property_trees =
620 inputs->root_layer->layer_tree_host()->property_trees(); 620 inputs->root_layer->GetLayerTree()->property_trees();
621 Layer* overscroll_elasticity_layer = nullptr; 621 Layer* overscroll_elasticity_layer = nullptr;
622 gfx::Vector2dF elastic_overscroll; 622 gfx::Vector2dF elastic_overscroll;
623 PropertyTreeBuilder::BuildPropertyTrees( 623 PropertyTreeBuilder::BuildPropertyTrees(
624 inputs->root_layer, inputs->page_scale_layer, 624 inputs->root_layer, inputs->page_scale_layer,
625 inputs->inner_viewport_scroll_layer, inputs->outer_viewport_scroll_layer, 625 inputs->inner_viewport_scroll_layer, inputs->outer_viewport_scroll_layer,
626 overscroll_elasticity_layer, elastic_overscroll, 626 overscroll_elasticity_layer, elastic_overscroll,
627 inputs->page_scale_factor, inputs->device_scale_factor, 627 inputs->page_scale_factor, inputs->device_scale_factor,
628 gfx::Rect(inputs->device_viewport_size), inputs->device_transform, 628 gfx::Rect(inputs->device_viewport_size), inputs->device_transform,
629 property_trees); 629 property_trees);
630 draw_property_utils::UpdatePropertyTrees(property_trees, 630 draw_property_utils::UpdatePropertyTrees(property_trees,
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 } 684 }
685 685
686 void LayerTreeHostCommon::CalculateDrawPropertiesForTesting( 686 void LayerTreeHostCommon::CalculateDrawPropertiesForTesting(
687 CalcDrawPropsImplInputsForTesting* inputs) { 687 CalcDrawPropsImplInputsForTesting* inputs) {
688 PropertyTreeBuilder::PreCalculateMetaInformationForTesting( 688 PropertyTreeBuilder::PreCalculateMetaInformationForTesting(
689 inputs->root_layer); 689 inputs->root_layer);
690 CalculateDrawPropertiesInternal(inputs, BUILD_PROPERTY_TREES_IF_NEEDED); 690 CalculateDrawPropertiesInternal(inputs, BUILD_PROPERTY_TREES_IF_NEEDED);
691 } 691 }
692 692
693 PropertyTrees* GetPropertyTrees(Layer* layer) { 693 PropertyTrees* GetPropertyTrees(Layer* layer) {
694 return layer->layer_tree_host()->property_trees(); 694 return layer->GetLayerTree()->property_trees();
695 } 695 }
696 696
697 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { 697 PropertyTrees* GetPropertyTrees(LayerImpl* layer) {
698 return layer->layer_tree_impl()->property_trees(); 698 return layer->layer_tree_impl()->property_trees();
699 } 699 }
700 700
701 } // namespace cc 701 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698