| OLD | NEW | 
|---|
| 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_iterator.h" | 5 #include "cc/layers/layer_iterator.h" | 
| 6 #include "cc/output/copy_output_request.h" | 6 #include "cc/output/copy_output_request.h" | 
| 7 #include "cc/output/copy_output_result.h" | 7 #include "cc/output/copy_output_result.h" | 
| 8 #include "cc/test/fake_content_layer_client.h" | 8 #include "cc/test/fake_content_layer_client.h" | 
| 9 #include "cc/test/fake_output_surface.h" | 9 #include "cc/test/fake_output_surface.h" | 
| 10 #include "cc/test/fake_picture_layer.h" | 10 #include "cc/test/fake_picture_layer.h" | 
| (...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 418   void SetupTree() override { | 418   void SetupTree() override { | 
| 419     root_ = FakePictureLayer::Create(layer_settings(), &client_); | 419     root_ = FakePictureLayer::Create(layer_settings(), &client_); | 
| 420     root_->SetBounds(gfx::Size(20, 20)); | 420     root_->SetBounds(gfx::Size(20, 20)); | 
| 421 | 421 | 
| 422     parent_layer_ = FakePictureLayer::Create(layer_settings(), &client_); | 422     parent_layer_ = FakePictureLayer::Create(layer_settings(), &client_); | 
| 423     parent_layer_->SetBounds(gfx::Size(15, 15)); | 423     parent_layer_->SetBounds(gfx::Size(15, 15)); | 
| 424     parent_layer_->SetMasksToBounds(true); | 424     parent_layer_->SetMasksToBounds(true); | 
| 425     root_->AddChild(parent_layer_); | 425     root_->AddChild(parent_layer_); | 
| 426 | 426 | 
| 427     copy_layer_ = FakePictureLayer::Create(layer_settings(), &client_); | 427     copy_layer_ = FakePictureLayer::Create(layer_settings(), &client_); | 
| 428     copy_layer_->SetPosition(gfx::Point(15, 15)); | 428     copy_layer_->SetPosition(gfx::PointF(15.f, 15.f)); | 
| 429     copy_layer_->SetBounds(gfx::Size(10, 10)); | 429     copy_layer_->SetBounds(gfx::Size(10, 10)); | 
| 430     parent_layer_->AddChild(copy_layer_); | 430     parent_layer_->AddChild(copy_layer_); | 
| 431 | 431 | 
| 432     layer_tree_host()->SetRootLayer(root_); | 432     layer_tree_host()->SetRootLayer(root_); | 
| 433     LayerTreeHostCopyRequestTest::SetupTree(); | 433     LayerTreeHostCopyRequestTest::SetupTree(); | 
| 434   } | 434   } | 
| 435 | 435 | 
| 436   void BeginTest() override { | 436   void BeginTest() override { | 
| 437     PostSetNeedsCommitToMainThread(); | 437     PostSetNeedsCommitToMainThread(); | 
| 438 | 438 | 
| (...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1092   int num_draws_; | 1092   int num_draws_; | 
| 1093   bool copy_happened_; | 1093   bool copy_happened_; | 
| 1094   bool draw_happened_; | 1094   bool draw_happened_; | 
| 1095 }; | 1095 }; | 
| 1096 | 1096 | 
| 1097 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F( | 1097 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F( | 
| 1098     LayerTreeHostCopyRequestTestMultipleDrawsHiddenCopyRequest); | 1098     LayerTreeHostCopyRequestTestMultipleDrawsHiddenCopyRequest); | 
| 1099 | 1099 | 
| 1100 }  // namespace | 1100 }  // namespace | 
| 1101 }  // namespace cc | 1101 }  // namespace cc | 
| OLD | NEW | 
|---|