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

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: remove unused test file. 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 623 matching lines...) Expand 10 before | Expand all | Expand 10 after
634 // A root layer render_surface should always exist after 634 // A root layer render_surface should always exist after
635 // CalculateDrawProperties. 635 // CalculateDrawProperties.
636 DCHECK(inputs->root_layer->render_surface()); 636 DCHECK(inputs->root_layer->render_surface());
637 } 637 }
638 638
639 void LayerTreeHostCommon::CalculateDrawPropertiesForTesting( 639 void LayerTreeHostCommon::CalculateDrawPropertiesForTesting(
640 CalcDrawPropsMainInputsForTesting* inputs) { 640 CalcDrawPropsMainInputsForTesting* inputs) {
641 LayerList update_layer_list; 641 LayerList update_layer_list;
642 bool can_render_to_separate_surface = true; 642 bool can_render_to_separate_surface = true;
643 PropertyTrees* property_trees = 643 PropertyTrees* property_trees =
644 inputs->root_layer->layer_tree_host()->property_trees(); 644 inputs->root_layer->GetLayerTree()->property_trees();
645 Layer* overscroll_elasticity_layer = nullptr; 645 Layer* overscroll_elasticity_layer = nullptr;
646 gfx::Vector2dF elastic_overscroll; 646 gfx::Vector2dF elastic_overscroll;
647 PropertyTreeBuilder::BuildPropertyTrees( 647 PropertyTreeBuilder::BuildPropertyTrees(
648 inputs->root_layer, inputs->page_scale_layer, 648 inputs->root_layer, inputs->page_scale_layer,
649 inputs->inner_viewport_scroll_layer, inputs->outer_viewport_scroll_layer, 649 inputs->inner_viewport_scroll_layer, inputs->outer_viewport_scroll_layer,
650 overscroll_elasticity_layer, elastic_overscroll, 650 overscroll_elasticity_layer, elastic_overscroll,
651 inputs->page_scale_factor, inputs->device_scale_factor, 651 inputs->page_scale_factor, inputs->device_scale_factor,
652 gfx::Rect(inputs->device_viewport_size), inputs->device_transform, 652 gfx::Rect(inputs->device_viewport_size), inputs->device_transform,
653 property_trees); 653 property_trees);
654 draw_property_utils::UpdatePropertyTrees(property_trees, 654 draw_property_utils::UpdatePropertyTrees(property_trees,
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 } 708 }
709 709
710 void LayerTreeHostCommon::CalculateDrawPropertiesForTesting( 710 void LayerTreeHostCommon::CalculateDrawPropertiesForTesting(
711 CalcDrawPropsImplInputsForTesting* inputs) { 711 CalcDrawPropsImplInputsForTesting* inputs) {
712 PropertyTreeBuilder::PreCalculateMetaInformationForTesting( 712 PropertyTreeBuilder::PreCalculateMetaInformationForTesting(
713 inputs->root_layer); 713 inputs->root_layer);
714 CalculateDrawPropertiesInternal(inputs, BUILD_PROPERTY_TREES_IF_NEEDED); 714 CalculateDrawPropertiesInternal(inputs, BUILD_PROPERTY_TREES_IF_NEEDED);
715 } 715 }
716 716
717 PropertyTrees* GetPropertyTrees(Layer* layer) { 717 PropertyTrees* GetPropertyTrees(Layer* layer) {
718 return layer->layer_tree_host()->property_trees(); 718 return layer->GetLayerTree()->property_trees();
719 } 719 }
720 720
721 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { 721 PropertyTrees* GetPropertyTrees(LayerImpl* layer) {
722 return layer->layer_tree_impl()->property_trees(); 722 return layer->layer_tree_impl()->property_trees();
723 } 723 }
724 724
725 } // namespace cc 725 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698