| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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.h" | 5 #include "cc/trees/layer_tree_host.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "cc/layers/empty_content_layer_client.h" | 10 #include "cc/layers/empty_content_layer_client.h" |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 layer_tree_host_dst_->root_layer()->id()); | 119 layer_tree_host_dst_->root_layer()->id()); |
| 120 EXPECT_EQ(layer_tree_host_dst_.get(), | 120 EXPECT_EQ(layer_tree_host_dst_.get(), |
| 121 layer_tree_dst->inputs_.root_layer->GetLayerTreeHostForTesting()); | 121 layer_tree_dst->inputs_.root_layer->GetLayerTreeHostForTesting()); |
| 122 EXPECT_EQ(layer_tree_src->inputs_.root_layer->double_sided(), | 122 EXPECT_EQ(layer_tree_src->inputs_.root_layer->double_sided(), |
| 123 layer_tree_dst->inputs_.root_layer->double_sided()); | 123 layer_tree_dst->inputs_.root_layer->double_sided()); |
| 124 EXPECT_EQ( | 124 EXPECT_EQ( |
| 125 layer_tree_host_src_->debug_state_.show_replica_screen_space_rects, | 125 layer_tree_host_src_->debug_state_.show_replica_screen_space_rects, |
| 126 layer_tree_host_dst_->debug_state_.show_replica_screen_space_rects); | 126 layer_tree_host_dst_->debug_state_.show_replica_screen_space_rects); |
| 127 EXPECT_EQ(layer_tree_src->inputs_.device_viewport_size, | 127 EXPECT_EQ(layer_tree_src->inputs_.device_viewport_size, |
| 128 layer_tree_dst->inputs_.device_viewport_size); | 128 layer_tree_dst->inputs_.device_viewport_size); |
| 129 EXPECT_EQ(layer_tree_src->inputs_.top_controls_shrink_blink_size, | |
| 130 layer_tree_dst->inputs_.top_controls_shrink_blink_size); | |
| 131 EXPECT_EQ(layer_tree_src->inputs_.top_controls_height, | |
| 132 layer_tree_dst->inputs_.top_controls_height); | |
| 133 EXPECT_EQ(layer_tree_src->inputs_.top_controls_shown_ratio, | |
| 134 layer_tree_dst->inputs_.top_controls_shown_ratio); | |
| 135 EXPECT_EQ(layer_tree_src->inputs_.device_scale_factor, | 129 EXPECT_EQ(layer_tree_src->inputs_.device_scale_factor, |
| 136 layer_tree_dst->inputs_.device_scale_factor); | 130 layer_tree_dst->inputs_.device_scale_factor); |
| 137 EXPECT_EQ(layer_tree_src->inputs_.painted_device_scale_factor, | 131 EXPECT_EQ(layer_tree_src->inputs_.painted_device_scale_factor, |
| 138 layer_tree_dst->inputs_.painted_device_scale_factor); | 132 layer_tree_dst->inputs_.painted_device_scale_factor); |
| 139 EXPECT_EQ(layer_tree_src->inputs_.page_scale_factor, | 133 EXPECT_EQ(layer_tree_src->inputs_.page_scale_factor, |
| 140 layer_tree_dst->inputs_.page_scale_factor); | 134 layer_tree_dst->inputs_.page_scale_factor); |
| 141 EXPECT_EQ(layer_tree_src->inputs_.min_page_scale_factor, | 135 EXPECT_EQ(layer_tree_src->inputs_.min_page_scale_factor, |
| 142 layer_tree_dst->inputs_.min_page_scale_factor); | 136 layer_tree_dst->inputs_.min_page_scale_factor); |
| 143 EXPECT_EQ(layer_tree_src->inputs_.max_page_scale_factor, | 137 EXPECT_EQ(layer_tree_src->inputs_.max_page_scale_factor, |
| 144 layer_tree_dst->inputs_.max_page_scale_factor); | 138 layer_tree_dst->inputs_.max_page_scale_factor); |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 | 225 |
| 232 // Just fake setup a layer for both source and dest. | 226 // Just fake setup a layer for both source and dest. |
| 233 scoped_refptr<Layer> root_layer_src = Layer::Create(); | 227 scoped_refptr<Layer> root_layer_src = Layer::Create(); |
| 234 layer_tree_host_src_->SetRootLayer(root_layer_src); | 228 layer_tree_host_src_->SetRootLayer(root_layer_src); |
| 235 layer_tree_host_dst_->SetRootLayer(Layer::Create()); | 229 layer_tree_host_dst_->SetRootLayer(Layer::Create()); |
| 236 root_layer_src->SetDoubleSided(!root_layer_src->double_sided()); | 230 root_layer_src->SetDoubleSided(!root_layer_src->double_sided()); |
| 237 | 231 |
| 238 layer_tree_host_src_->debug_state_.show_replica_screen_space_rects = | 232 layer_tree_host_src_->debug_state_.show_replica_screen_space_rects = |
| 239 !layer_tree_host_src_->debug_state_.show_replica_screen_space_rects; | 233 !layer_tree_host_src_->debug_state_.show_replica_screen_space_rects; |
| 240 layer_tree_src->inputs_.device_viewport_size = gfx::Size(3, 14); | 234 layer_tree_src->inputs_.device_viewport_size = gfx::Size(3, 14); |
| 241 layer_tree_src->inputs_.top_controls_shrink_blink_size = | |
| 242 !layer_tree_src->inputs_.top_controls_shrink_blink_size; | |
| 243 layer_tree_src->inputs_.top_controls_height = | |
| 244 layer_tree_src->inputs_.top_controls_height * 3 + 1; | |
| 245 layer_tree_src->inputs_.top_controls_shown_ratio = | |
| 246 layer_tree_src->inputs_.top_controls_shown_ratio * 3 + 1; | |
| 247 layer_tree_src->inputs_.device_scale_factor = | 235 layer_tree_src->inputs_.device_scale_factor = |
| 248 layer_tree_src->inputs_.device_scale_factor * 3 + 1; | 236 layer_tree_src->inputs_.device_scale_factor * 3 + 1; |
| 249 layer_tree_src->inputs_.painted_device_scale_factor = | 237 layer_tree_src->inputs_.painted_device_scale_factor = |
| 250 layer_tree_src->inputs_.painted_device_scale_factor * 3 + 1; | 238 layer_tree_src->inputs_.painted_device_scale_factor * 3 + 1; |
| 251 layer_tree_src->inputs_.page_scale_factor = | 239 layer_tree_src->inputs_.page_scale_factor = |
| 252 layer_tree_src->inputs_.page_scale_factor * 3 + 1; | 240 layer_tree_src->inputs_.page_scale_factor * 3 + 1; |
| 253 layer_tree_src->inputs_.min_page_scale_factor = | 241 layer_tree_src->inputs_.min_page_scale_factor = |
| 254 layer_tree_src->inputs_.min_page_scale_factor * 3 + 1; | 242 layer_tree_src->inputs_.min_page_scale_factor * 3 + 1; |
| 255 layer_tree_src->inputs_.max_page_scale_factor = | 243 layer_tree_src->inputs_.max_page_scale_factor = |
| 256 layer_tree_src->inputs_.max_page_scale_factor * 3 + 1; | 244 layer_tree_src->inputs_.max_page_scale_factor * 3 + 1; |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 454 | 442 |
| 455 TEST_F(LayerTreeHostSerializationTest, AddAndRemoveNodeFromLayerTree) { | 443 TEST_F(LayerTreeHostSerializationTest, AddAndRemoveNodeFromLayerTree) { |
| 456 RunAddAndRemoveNodeFromLayerTree(); | 444 RunAddAndRemoveNodeFromLayerTree(); |
| 457 } | 445 } |
| 458 | 446 |
| 459 TEST_F(LayerTreeHostSerializationTest, PictureLayerMultipleSerializations) { | 447 TEST_F(LayerTreeHostSerializationTest, PictureLayerMultipleSerializations) { |
| 460 RunPictureLayerMultipleSerializationsTest(); | 448 RunPictureLayerMultipleSerializationsTest(); |
| 461 } | 449 } |
| 462 | 450 |
| 463 } // namespace cc | 451 } // namespace cc |
| OLD | NEW |