Chromium Code Reviews| 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/trees/layer_tree_host.h" | 5 #include "cc/trees/layer_tree_host.h" |
| 6 | 6 |
| 7 #include "cc/layers/delegated_renderer_layer.h" | 7 #include "cc/layers/delegated_renderer_layer.h" |
| 8 #include "cc/layers/delegated_renderer_layer_impl.h" | 8 #include "cc/layers/delegated_renderer_layer_impl.h" |
| 9 #include "cc/output/delegated_frame_data.h" | 9 #include "cc/output/delegated_frame_data.h" |
| 10 #include "cc/quads/shared_quad_state.h" | 10 #include "cc/quads/shared_quad_state.h" |
| (...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 496 | 496 |
| 497 // Resource are never immediately released. | 497 // Resource are never immediately released. |
| 498 TransferableResourceArray empty_resources; | 498 TransferableResourceArray empty_resources; |
| 499 delegated_->TakeUnusedResourcesForChildCompositor(&empty_resources); | 499 delegated_->TakeUnusedResourcesForChildCompositor(&empty_resources); |
| 500 EXPECT_TRUE(empty_resources.empty()); | 500 EXPECT_TRUE(empty_resources.empty()); |
| 501 } | 501 } |
| 502 | 502 |
| 503 virtual void AfterTest() OVERRIDE {} | 503 virtual void AfterTest() OVERRIDE {} |
| 504 }; | 504 }; |
| 505 | 505 |
| 506 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestReturnUnusedResources); | 506 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F( |
|
piman
2013/05/08 19:24:36
qq: what are the failures types in these tests wit
danakj
2013/05/08 19:28:03
Basically, when we send a frame with the FakeOutpu
piman
2013/05/08 19:35:16
Got it, thanks. Sounds like a good candidate for a
danakj
2013/05/08 23:43:47
Ya, true. https://code.google.com/p/chromium/issue
| |
| 507 LayerTreeHostDelegatedTestReturnUnusedResources); | |
| 507 | 508 |
| 508 class LayerTreeHostDelegatedTestReusedResources | 509 class LayerTreeHostDelegatedTestReusedResources |
| 509 : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer { | 510 : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer { |
| 510 public: | 511 public: |
| 511 virtual void BeginTest() OVERRIDE { | 512 virtual void BeginTest() OVERRIDE { |
| 512 PostSetNeedsCommitToMainThread(); | 513 PostSetNeedsCommitToMainThread(); |
| 513 } | 514 } |
| 514 | 515 |
| 515 virtual void DidCommit() OVERRIDE { | 516 virtual void DidCommit() OVERRIDE { |
| 516 scoped_ptr<DelegatedFrameData> frame; | 517 scoped_ptr<DelegatedFrameData> frame; |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 555 EXPECT_EQ(1u, resources.size()); | 556 EXPECT_EQ(1u, resources.size()); |
| 556 EXPECT_EQ(999u, resources[0].id); | 557 EXPECT_EQ(999u, resources[0].id); |
| 557 EndTest(); | 558 EndTest(); |
| 558 break; | 559 break; |
| 559 } | 560 } |
| 560 } | 561 } |
| 561 | 562 |
| 562 virtual void AfterTest() OVERRIDE {} | 563 virtual void AfterTest() OVERRIDE {} |
| 563 }; | 564 }; |
| 564 | 565 |
| 565 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestReusedResources); | 566 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F( |
| 567 LayerTreeHostDelegatedTestReusedResources); | |
| 566 | 568 |
| 567 class LayerTreeHostDelegatedTestFrameBeforeAck | 569 class LayerTreeHostDelegatedTestFrameBeforeAck |
| 568 : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer { | 570 : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer { |
| 569 public: | 571 public: |
| 570 virtual void BeginTest() OVERRIDE { | 572 virtual void BeginTest() OVERRIDE { |
| 571 PostSetNeedsCommitToMainThread(); | 573 PostSetNeedsCommitToMainThread(); |
| 572 } | 574 } |
| 573 | 575 |
| 574 virtual void DidCommit() OVERRIDE { | 576 virtual void DidCommit() OVERRIDE { |
| 575 scoped_ptr<DelegatedFrameData> frame; | 577 scoped_ptr<DelegatedFrameData> frame; |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 652 const TextureDrawQuad* quad = TextureDrawQuad::MaterialCast( | 654 const TextureDrawQuad* quad = TextureDrawQuad::MaterialCast( |
| 653 pass->quad_list[0]); | 655 pass->quad_list[0]); |
| 654 EXPECT_EQ(map.find(999)->second, quad->resource_id); | 656 EXPECT_EQ(map.find(999)->second, quad->resource_id); |
| 655 | 657 |
| 656 EndTest(); | 658 EndTest(); |
| 657 } | 659 } |
| 658 | 660 |
| 659 virtual void AfterTest() OVERRIDE {} | 661 virtual void AfterTest() OVERRIDE {} |
| 660 }; | 662 }; |
| 661 | 663 |
| 662 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestFrameBeforeAck); | 664 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F( |
| 665 LayerTreeHostDelegatedTestFrameBeforeAck); | |
| 663 | 666 |
| 664 class LayerTreeHostDelegatedTestFrameBeforeTakeResources | 667 class LayerTreeHostDelegatedTestFrameBeforeTakeResources |
| 665 : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer { | 668 : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer { |
| 666 public: | 669 public: |
| 667 virtual void BeginTest() OVERRIDE { | 670 virtual void BeginTest() OVERRIDE { |
| 668 PostSetNeedsCommitToMainThread(); | 671 PostSetNeedsCommitToMainThread(); |
| 669 } | 672 } |
| 670 | 673 |
| 671 virtual void DidCommit() OVERRIDE { | 674 virtual void DidCommit() OVERRIDE { |
| 672 scoped_ptr<DelegatedFrameData> frame; | 675 scoped_ptr<DelegatedFrameData> frame; |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 756 pass->quad_list[1]); | 759 pass->quad_list[1]); |
| 757 EXPECT_EQ(map.find(555)->second, quad2->resource_id); | 760 EXPECT_EQ(map.find(555)->second, quad2->resource_id); |
| 758 const TextureDrawQuad* quad3 = TextureDrawQuad::MaterialCast( | 761 const TextureDrawQuad* quad3 = TextureDrawQuad::MaterialCast( |
| 759 pass->quad_list[2]); | 762 pass->quad_list[2]); |
| 760 EXPECT_EQ(map.find(444)->second, quad3->resource_id); | 763 EXPECT_EQ(map.find(444)->second, quad3->resource_id); |
| 761 } | 764 } |
| 762 | 765 |
| 763 virtual void AfterTest() OVERRIDE {} | 766 virtual void AfterTest() OVERRIDE {} |
| 764 }; | 767 }; |
| 765 | 768 |
| 766 SINGLE_AND_MULTI_THREAD_TEST_F( | 769 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F( |
| 767 LayerTreeHostDelegatedTestFrameBeforeTakeResources); | 770 LayerTreeHostDelegatedTestFrameBeforeTakeResources); |
| 768 | 771 |
| 769 class LayerTreeHostDelegatedTestBadFrame | 772 class LayerTreeHostDelegatedTestBadFrame |
| 770 : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer { | 773 : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer { |
| 771 public: | 774 public: |
| 772 virtual void BeginTest() OVERRIDE { | 775 virtual void BeginTest() OVERRIDE { |
| 773 PostSetNeedsCommitToMainThread(); | 776 PostSetNeedsCommitToMainThread(); |
| 774 } | 777 } |
| 775 | 778 |
| 776 virtual void DidCommit() OVERRIDE { | 779 virtual void DidCommit() OVERRIDE { |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 899 pass->quad_list[0]); | 902 pass->quad_list[0]); |
| 900 EXPECT_EQ(map.find(999)->second, quad1->resource_id); | 903 EXPECT_EQ(map.find(999)->second, quad1->resource_id); |
| 901 break; | 904 break; |
| 902 } | 905 } |
| 903 } | 906 } |
| 904 } | 907 } |
| 905 | 908 |
| 906 virtual void AfterTest() OVERRIDE {} | 909 virtual void AfterTest() OVERRIDE {} |
| 907 }; | 910 }; |
| 908 | 911 |
| 909 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestBadFrame); | 912 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F( |
| 913 LayerTreeHostDelegatedTestBadFrame); | |
| 910 | 914 |
| 911 class LayerTreeHostDelegatedTestUnnamedResource | 915 class LayerTreeHostDelegatedTestUnnamedResource |
| 912 : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer { | 916 : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer { |
| 913 public: | 917 public: |
| 914 virtual void BeginTest() OVERRIDE { | 918 virtual void BeginTest() OVERRIDE { |
| 915 PostSetNeedsCommitToMainThread(); | 919 PostSetNeedsCommitToMainThread(); |
| 916 } | 920 } |
| 917 | 921 |
| 918 virtual void DidCommit() OVERRIDE { | 922 virtual void DidCommit() OVERRIDE { |
| 919 scoped_ptr<DelegatedFrameData> frame; | 923 scoped_ptr<DelegatedFrameData> frame; |
| (...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1242 } | 1246 } |
| 1243 } | 1247 } |
| 1244 | 1248 |
| 1245 virtual void AfterTest() OVERRIDE {} | 1249 virtual void AfterTest() OVERRIDE {} |
| 1246 }; | 1250 }; |
| 1247 | 1251 |
| 1248 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestCommitWithoutTake); | 1252 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestCommitWithoutTake); |
| 1249 | 1253 |
| 1250 } // namespace | 1254 } // namespace |
| 1251 } // namespace cc | 1255 } // namespace cc |
| OLD | NEW |