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

Side by Side Diff: cc/layers/layer_position_constraint_unittest.cc

Issue 2886243004: Refactor RegisterViewportLayers to use a struct instead of 6 values (Closed)
Patch Set: CC_EXPORT ViewportLayers to make the Windows compile+link happy. Created 3 years, 7 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 | « no previous file | cc/test/layer_tree_test.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/layers/layer_position_constraint.h" 5 #include "cc/layers/layer_position_constraint.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "cc/animation/animation_host.h" 9 #include "cc/animation/animation_host.h"
10 #include "cc/layers/layer.h" 10 #include "cc/layers/layer.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 128
129 grand_child_->AddChild(great_grand_child_); 129 grand_child_->AddChild(great_grand_child_);
130 child_->AddChild(grand_child_); 130 child_->AddChild(grand_child_);
131 child_transform_layer_->AddChild(child_); 131 child_transform_layer_->AddChild(child_);
132 outer_viewport_container_layer_->AddChild(child_transform_layer_); 132 outer_viewport_container_layer_->AddChild(child_transform_layer_);
133 scroll_layer_->AddChild(outer_viewport_container_layer_); 133 scroll_layer_->AddChild(outer_viewport_container_layer_);
134 inner_viewport_container_layer_->AddChild(scroll_layer_); 134 inner_viewport_container_layer_->AddChild(scroll_layer_);
135 root_->AddChild(inner_viewport_container_layer_); 135 root_->AddChild(inner_viewport_container_layer_);
136 136
137 layer_tree_host_->SetRootLayer(root_); 137 layer_tree_host_->SetRootLayer(root_);
138 layer_tree_host_->RegisterViewportLayers( 138 LayerTreeHost::ViewportLayers viewport_layers;
139 nullptr, root_, inner_viewport_container_layer_, 139 viewport_layers.page_scale = root_;
140 outer_viewport_container_layer_, scroll_layer_, child_); 140 viewport_layers.inner_viewport_container = inner_viewport_container_layer_;
141 viewport_layers.outer_viewport_container = outer_viewport_container_layer_;
142 viewport_layers.inner_viewport_scroll = scroll_layer_;
143 viewport_layers.outer_viewport_scroll = child_;
144 layer_tree_host_->RegisterViewportLayers(viewport_layers);
141 } 145 }
142 146
143 void CommitAndUpdateImplPointers() { 147 void CommitAndUpdateImplPointers() {
144 LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs( 148 LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
145 root_.get(), root_->bounds()); 149 root_.get(), root_->bounds());
146 inputs.inner_viewport_scroll_layer = 150 inputs.inner_viewport_scroll_layer =
147 layer_tree_host_->inner_viewport_scroll_layer(); 151 layer_tree_host_->inner_viewport_scroll_layer();
148 inputs.outer_viewport_scroll_layer = 152 inputs.outer_viewport_scroll_layer =
149 layer_tree_host_->outer_viewport_scroll_layer(); 153 layer_tree_host_->outer_viewport_scroll_layer();
150 LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs); 154 LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
(...skipping 995 matching lines...) Expand 10 before | Expand all | Expand 10 after
1146 expected_fixed_child_transform.Translate(20.0, 20.0); 1150 expected_fixed_child_transform.Translate(20.0, 20.0);
1147 1151
1148 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_scroll_layer_transform, 1152 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_scroll_layer_transform,
1149 scroll_layer_impl_->DrawTransform()); 1153 scroll_layer_impl_->DrawTransform());
1150 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_fixed_child_transform, 1154 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_fixed_child_transform,
1151 fixed_child_impl->DrawTransform()); 1155 fixed_child_impl->DrawTransform());
1152 } 1156 }
1153 1157
1154 } // namespace 1158 } // namespace
1155 } // namespace cc 1159 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | cc/test/layer_tree_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698