| 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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 layer_tree_host_dst_->content_is_suitable_for_gpu_rasterization_); | 147 layer_tree_host_dst_->content_is_suitable_for_gpu_rasterization_); |
| 148 EXPECT_EQ(layer_tree_host_src_->background_color_, | 148 EXPECT_EQ(layer_tree_host_src_->background_color_, |
| 149 layer_tree_host_dst_->background_color_); | 149 layer_tree_host_dst_->background_color_); |
| 150 EXPECT_EQ(layer_tree_host_src_->has_transparent_background_, | 150 EXPECT_EQ(layer_tree_host_src_->has_transparent_background_, |
| 151 layer_tree_host_dst_->has_transparent_background_); | 151 layer_tree_host_dst_->has_transparent_background_); |
| 152 EXPECT_EQ(layer_tree_host_src_->in_paint_layer_contents_, | 152 EXPECT_EQ(layer_tree_host_src_->in_paint_layer_contents_, |
| 153 layer_tree_host_dst_->in_paint_layer_contents_); | 153 layer_tree_host_dst_->in_paint_layer_contents_); |
| 154 EXPECT_EQ(layer_tree_host_src_->id_, layer_tree_host_dst_->id_); | 154 EXPECT_EQ(layer_tree_host_src_->id_, layer_tree_host_dst_->id_); |
| 155 EXPECT_EQ(layer_tree_host_src_->next_commit_forces_redraw_, | 155 EXPECT_EQ(layer_tree_host_src_->next_commit_forces_redraw_, |
| 156 layer_tree_host_dst_->next_commit_forces_redraw_); | 156 layer_tree_host_dst_->next_commit_forces_redraw_); |
| 157 for (auto layer : layers_that_should_push_properties_src) { | 157 for (auto* layer : layers_that_should_push_properties_src) { |
| 158 EXPECT_TRUE(layer_tree_host_dst_->LayerNeedsPushPropertiesForTesting( | 158 EXPECT_TRUE(layer_tree_host_dst_->LayerNeedsPushPropertiesForTesting( |
| 159 layer_tree_host_dst_->LayerById(layer->id()))); | 159 layer_tree_host_dst_->LayerById(layer->id()))); |
| 160 } | 160 } |
| 161 | 161 |
| 162 if (layer_tree_host_src_->hud_layer_) { | 162 if (layer_tree_host_src_->hud_layer_) { |
| 163 EXPECT_EQ(layer_tree_host_src_->hud_layer_->id(), | 163 EXPECT_EQ(layer_tree_host_src_->hud_layer_->id(), |
| 164 layer_tree_host_dst_->hud_layer_->id()); | 164 layer_tree_host_dst_->hud_layer_->id()); |
| 165 // The HUD layer member is a HeadsUpDisplayLayer instead of Layer, so | 165 // The HUD layer member is a HeadsUpDisplayLayer instead of Layer, so |
| 166 // inspect the proto to see if it contains the the right layer type. | 166 // inspect the proto to see if it contains the the right layer type. |
| 167 bool found_hud_layer_type = false; | 167 bool found_hud_layer_type = false; |
| (...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 447 | 447 |
| 448 TEST_F(LayerTreeHostSerializationTest, AddAndRemoveNodeFromLayerTree) { | 448 TEST_F(LayerTreeHostSerializationTest, AddAndRemoveNodeFromLayerTree) { |
| 449 RunAddAndRemoveNodeFromLayerTree(); | 449 RunAddAndRemoveNodeFromLayerTree(); |
| 450 } | 450 } |
| 451 | 451 |
| 452 TEST_F(LayerTreeHostSerializationTest, PictureLayerMultipleSerializations) { | 452 TEST_F(LayerTreeHostSerializationTest, PictureLayerMultipleSerializations) { |
| 453 RunPictureLayerMultipleSerializationsTest(); | 453 RunPictureLayerMultipleSerializationsTest(); |
| 454 } | 454 } |
| 455 | 455 |
| 456 } // namespace cc | 456 } // namespace cc |
| OLD | NEW |