| 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 "cc/layers/heads_up_display_layer.h" | 7 #include "cc/layers/heads_up_display_layer.h" |
| 8 #include "cc/layers/layer.h" | 8 #include "cc/layers/layer.h" |
| 9 #include "cc/proto/layer.pb.h" | 9 #include "cc/proto/layer.pb.h" |
| 10 #include "cc/proto/layer_tree_host.pb.h" | 10 #include "cc/proto/layer_tree_host.pb.h" |
| (...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 layer_src_root->AddChild(layer_src_c); | 346 layer_src_root->AddChild(layer_src_c); |
| 347 layer_src_c->AddChild(layer_src_d); | 347 layer_src_c->AddChild(layer_src_d); |
| 348 | 348 |
| 349 VerifySerializationAndDeserialization(); | 349 VerifySerializationAndDeserialization(); |
| 350 VerifyHostHasAllExpectedLayersInTree(layer_tree_host_dst_->root_layer()); | 350 VerifyHostHasAllExpectedLayersInTree(layer_tree_host_dst_->root_layer()); |
| 351 } | 351 } |
| 352 | 352 |
| 353 private: | 353 private: |
| 354 TestTaskGraphRunner task_graph_runner_src_; | 354 TestTaskGraphRunner task_graph_runner_src_; |
| 355 FakeLayerTreeHostClient client_src_; | 355 FakeLayerTreeHostClient client_src_; |
| 356 scoped_ptr<LayerTreeHost> layer_tree_host_src_; | 356 std::unique_ptr<LayerTreeHost> layer_tree_host_src_; |
| 357 | 357 |
| 358 TestTaskGraphRunner task_graph_runner_dst_; | 358 TestTaskGraphRunner task_graph_runner_dst_; |
| 359 FakeLayerTreeHostClient client_dst_; | 359 FakeLayerTreeHostClient client_dst_; |
| 360 scoped_ptr<LayerTreeHost> layer_tree_host_dst_; | 360 std::unique_ptr<LayerTreeHost> layer_tree_host_dst_; |
| 361 }; | 361 }; |
| 362 | 362 |
| 363 TEST_F(LayerTreeHostSerializationTest, AllMembersChanged) { | 363 TEST_F(LayerTreeHostSerializationTest, AllMembersChanged) { |
| 364 RunAllMembersChangedTest(); | 364 RunAllMembersChangedTest(); |
| 365 } | 365 } |
| 366 | 366 |
| 367 TEST_F(LayerTreeHostSerializationTest, LayersChanged) { | 367 TEST_F(LayerTreeHostSerializationTest, LayersChanged) { |
| 368 RunLayersChangedTest(); | 368 RunLayersChangedTest(); |
| 369 } | 369 } |
| 370 | 370 |
| 371 TEST_F(LayerTreeHostSerializationTest, LayersChangedMultipleSerializations) { | 371 TEST_F(LayerTreeHostSerializationTest, LayersChangedMultipleSerializations) { |
| 372 RunLayersChangedMultipleSerializations(); | 372 RunLayersChangedMultipleSerializations(); |
| 373 } | 373 } |
| 374 | 374 |
| 375 TEST_F(LayerTreeHostSerializationTest, AddAndRemoveNodeFromLayerTree) { | 375 TEST_F(LayerTreeHostSerializationTest, AddAndRemoveNodeFromLayerTree) { |
| 376 RunAddAndRemoveNodeFromLayerTree(); | 376 RunAddAndRemoveNodeFromLayerTree(); |
| 377 } | 377 } |
| 378 | 378 |
| 379 } // namespace cc | 379 } // namespace cc |
| OLD | NEW |