Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(62)

Side by Side Diff: cc/trees/layer_tree_host_unittest_delegated.cc

Issue 14925009: Run all LayerTreeHost tests with a delegating renderer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: uber-unittests: for landing2 Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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_client.h" 8 #include "cc/layers/delegated_renderer_layer_client.h"
9 #include "cc/layers/delegated_renderer_layer_impl.h" 9 #include "cc/layers/delegated_renderer_layer_impl.h"
10 #include "cc/output/delegated_frame_data.h" 10 #include "cc/output/delegated_frame_data.h"
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 532
533 // Resource are never immediately released. 533 // Resource are never immediately released.
534 TransferableResourceArray empty_resources; 534 TransferableResourceArray empty_resources;
535 delegated_->TakeUnusedResourcesForChildCompositor(&empty_resources); 535 delegated_->TakeUnusedResourcesForChildCompositor(&empty_resources);
536 EXPECT_TRUE(empty_resources.empty()); 536 EXPECT_TRUE(empty_resources.empty());
537 } 537 }
538 538
539 virtual void AfterTest() OVERRIDE {} 539 virtual void AfterTest() OVERRIDE {}
540 }; 540 };
541 541
542 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestReturnUnusedResources); 542 // Enable this for delegating renderer. crbug.com/239290
543 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(
544 LayerTreeHostDelegatedTestReturnUnusedResources);
543 545
544 class LayerTreeHostDelegatedTestReusedResources 546 class LayerTreeHostDelegatedTestReusedResources
545 : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer { 547 : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer {
546 public: 548 public:
547 virtual void BeginTest() OVERRIDE { 549 virtual void BeginTest() OVERRIDE {
548 PostSetNeedsCommitToMainThread(); 550 PostSetNeedsCommitToMainThread();
549 } 551 }
550 552
551 virtual void DidCommit() OVERRIDE { 553 virtual void DidCommit() OVERRIDE {
552 scoped_ptr<DelegatedFrameData> frame; 554 scoped_ptr<DelegatedFrameData> frame;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 EXPECT_EQ(1u, resources.size()); 593 EXPECT_EQ(1u, resources.size());
592 EXPECT_EQ(999u, resources[0].id); 594 EXPECT_EQ(999u, resources[0].id);
593 EndTest(); 595 EndTest();
594 break; 596 break;
595 } 597 }
596 } 598 }
597 599
598 virtual void AfterTest() OVERRIDE {} 600 virtual void AfterTest() OVERRIDE {}
599 }; 601 };
600 602
601 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestReusedResources); 603 // Enable this for delegating renderer. crbug.com/239290
604 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(
605 LayerTreeHostDelegatedTestReusedResources);
602 606
603 class LayerTreeHostDelegatedTestFrameBeforeAck 607 class LayerTreeHostDelegatedTestFrameBeforeAck
604 : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer { 608 : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer {
605 public: 609 public:
606 virtual void BeginTest() OVERRIDE { 610 virtual void BeginTest() OVERRIDE {
607 PostSetNeedsCommitToMainThread(); 611 PostSetNeedsCommitToMainThread();
608 } 612 }
609 613
610 virtual void DidCommit() OVERRIDE { 614 virtual void DidCommit() OVERRIDE {
611 scoped_ptr<DelegatedFrameData> frame; 615 scoped_ptr<DelegatedFrameData> frame;
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 const TextureDrawQuad* quad = TextureDrawQuad::MaterialCast( 692 const TextureDrawQuad* quad = TextureDrawQuad::MaterialCast(
689 pass->quad_list[0]); 693 pass->quad_list[0]);
690 EXPECT_EQ(map.find(999)->second, quad->resource_id); 694 EXPECT_EQ(map.find(999)->second, quad->resource_id);
691 695
692 EndTest(); 696 EndTest();
693 } 697 }
694 698
695 virtual void AfterTest() OVERRIDE {} 699 virtual void AfterTest() OVERRIDE {}
696 }; 700 };
697 701
698 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestFrameBeforeAck); 702 // Enable this for delegating renderer. crbug.com/239290
703 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(
704 LayerTreeHostDelegatedTestFrameBeforeAck);
699 705
700 class LayerTreeHostDelegatedTestFrameBeforeTakeResources 706 class LayerTreeHostDelegatedTestFrameBeforeTakeResources
701 : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer { 707 : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer {
702 public: 708 public:
703 virtual void BeginTest() OVERRIDE { 709 virtual void BeginTest() OVERRIDE {
704 PostSetNeedsCommitToMainThread(); 710 PostSetNeedsCommitToMainThread();
705 } 711 }
706 712
707 virtual void DidCommit() OVERRIDE { 713 virtual void DidCommit() OVERRIDE {
708 scoped_ptr<DelegatedFrameData> frame; 714 scoped_ptr<DelegatedFrameData> frame;
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 pass->quad_list[1]); 798 pass->quad_list[1]);
793 EXPECT_EQ(map.find(555)->second, quad2->resource_id); 799 EXPECT_EQ(map.find(555)->second, quad2->resource_id);
794 const TextureDrawQuad* quad3 = TextureDrawQuad::MaterialCast( 800 const TextureDrawQuad* quad3 = TextureDrawQuad::MaterialCast(
795 pass->quad_list[2]); 801 pass->quad_list[2]);
796 EXPECT_EQ(map.find(444)->second, quad3->resource_id); 802 EXPECT_EQ(map.find(444)->second, quad3->resource_id);
797 } 803 }
798 804
799 virtual void AfterTest() OVERRIDE {} 805 virtual void AfterTest() OVERRIDE {}
800 }; 806 };
801 807
802 SINGLE_AND_MULTI_THREAD_TEST_F( 808 // Enable this for delegating renderer. crbug.com/239290
809 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(
803 LayerTreeHostDelegatedTestFrameBeforeTakeResources); 810 LayerTreeHostDelegatedTestFrameBeforeTakeResources);
804 811
805 class LayerTreeHostDelegatedTestBadFrame 812 class LayerTreeHostDelegatedTestBadFrame
806 : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer { 813 : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer {
807 public: 814 public:
808 virtual void BeginTest() OVERRIDE { 815 virtual void BeginTest() OVERRIDE {
809 PostSetNeedsCommitToMainThread(); 816 PostSetNeedsCommitToMainThread();
810 } 817 }
811 818
812 virtual void DidCommit() OVERRIDE { 819 virtual void DidCommit() OVERRIDE {
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
935 pass->quad_list[0]); 942 pass->quad_list[0]);
936 EXPECT_EQ(map.find(999)->second, quad1->resource_id); 943 EXPECT_EQ(map.find(999)->second, quad1->resource_id);
937 break; 944 break;
938 } 945 }
939 } 946 }
940 } 947 }
941 948
942 virtual void AfterTest() OVERRIDE {} 949 virtual void AfterTest() OVERRIDE {}
943 }; 950 };
944 951
945 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestBadFrame); 952 // Enable this for delegating renderer. crbug.com/239290
953 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(
954 LayerTreeHostDelegatedTestBadFrame);
946 955
947 class LayerTreeHostDelegatedTestUnnamedResource 956 class LayerTreeHostDelegatedTestUnnamedResource
948 : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer { 957 : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer {
949 public: 958 public:
950 virtual void BeginTest() OVERRIDE { 959 virtual void BeginTest() OVERRIDE {
951 PostSetNeedsCommitToMainThread(); 960 PostSetNeedsCommitToMainThread();
952 } 961 }
953 962
954 virtual void DidCommit() OVERRIDE { 963 virtual void DidCommit() OVERRIDE {
955 scoped_ptr<DelegatedFrameData> frame; 964 scoped_ptr<DelegatedFrameData> frame;
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
1278 } 1287 }
1279 } 1288 }
1280 1289
1281 virtual void AfterTest() OVERRIDE {} 1290 virtual void AfterTest() OVERRIDE {}
1282 }; 1291 };
1283 1292
1284 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestCommitWithoutTake); 1293 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestCommitWithoutTake);
1285 1294
1286 } // namespace 1295 } // namespace
1287 } // namespace cc 1296 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_unittest_damage.cc ('k') | cc/trees/layer_tree_host_unittest_scroll.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698