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

Side by Side Diff: cc/test/layer_tree_test.cc

Issue 2231233002: cc: Remove the lie of "DirectRenderer" in LayerTreeTests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: no-ltt-delegating: ccpt Created 4 years, 4 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
« no previous file with comments | « cc/test/layer_tree_test.h ('k') | cc/trees/layer_tree_host_common_perftest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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/test/layer_tree_test.h" 5 #include "cc/test/layer_tree_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 769 matching lines...) Expand 10 before | Expand all | Expand 10 after
780 if (layer_tree_host_) 780 if (layer_tree_host_)
781 layer_tree_host_->Composite(base::TimeTicks::Now()); 781 layer_tree_host_->Composite(base::TimeTicks::Now());
782 } 782 }
783 783
784 void LayerTreeTest::DispatchNextCommitWaitsForActivation() { 784 void LayerTreeTest::DispatchNextCommitWaitsForActivation() {
785 DCHECK(main_task_runner_->BelongsToCurrentThread()); 785 DCHECK(main_task_runner_->BelongsToCurrentThread());
786 if (layer_tree_host_) 786 if (layer_tree_host_)
787 layer_tree_host_->SetNextCommitWaitsForActivation(); 787 layer_tree_host_->SetNextCommitWaitsForActivation();
788 } 788 }
789 789
790 void LayerTreeTest::RunTest(CompositorMode mode, bool delegating_renderer) { 790 void LayerTreeTest::RunTest(CompositorMode mode) {
791 mode_ = mode; 791 mode_ = mode;
792 if (mode_ == CompositorMode::THREADED || mode_ == CompositorMode::REMOTE) { 792 if (mode_ == CompositorMode::THREADED || mode_ == CompositorMode::REMOTE) {
793 impl_thread_.reset(new base::Thread("Compositor")); 793 impl_thread_.reset(new base::Thread("Compositor"));
794 ASSERT_TRUE(impl_thread_->Start()); 794 ASSERT_TRUE(impl_thread_->Start());
795 } 795 }
796 796
797 shared_bitmap_manager_.reset(new TestSharedBitmapManager); 797 shared_bitmap_manager_.reset(new TestSharedBitmapManager);
798 gpu_memory_buffer_manager_.reset(new TestGpuMemoryBufferManager); 798 gpu_memory_buffer_manager_.reset(new TestGpuMemoryBufferManager);
799 task_graph_runner_.reset(new TestTaskGraphRunner); 799 task_graph_runner_.reset(new TestTaskGraphRunner);
800 800
801 delegating_renderer_ = delegating_renderer;
802
803 // Spend less time waiting for BeginFrame because the output is 801 // Spend less time waiting for BeginFrame because the output is
804 // mocked out. 802 // mocked out.
805 settings_.renderer_settings.refresh_rate = 200.0; 803 settings_.renderer_settings.refresh_rate = 200.0;
806 settings_.background_animation_rate = 200.0; 804 settings_.background_animation_rate = 200.0;
807 settings_.verify_clip_tree_calculations = true; 805 settings_.verify_clip_tree_calculations = true;
808 settings_.verify_transform_tree_calculations = true; 806 settings_.verify_transform_tree_calculations = true;
809 settings_.renderer_settings.buffer_to_texture_target_map = 807 settings_.renderer_settings.buffer_to_texture_target_map =
810 DefaultBufferToTextureTargetMapForTesting(); 808 DefaultBufferToTextureTargetMapForTesting();
811 // The TestDelegatingOutputSurface will provide a BeginFrameSource. 809 // The TestDelegatingOutputSurface will provide a BeginFrameSource.
812 settings_.use_output_surface_begin_frame_source = true; 810 settings_.use_output_surface_begin_frame_source = true;
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
939 } 937 }
940 938
941 LayerTreeHost* LayerTreeTest::remote_client_layer_tree_host() { 939 LayerTreeHost* LayerTreeTest::remote_client_layer_tree_host() {
942 DCHECK(IsRemoteTest()); 940 DCHECK(IsRemoteTest());
943 DCHECK(task_runner_provider()->IsMainThread() || 941 DCHECK(task_runner_provider()->IsMainThread() ||
944 task_runner_provider()->IsMainThreadBlocked()); 942 task_runner_provider()->IsMainThreadBlocked());
945 return remote_client_layer_tree_host_.get(); 943 return remote_client_layer_tree_host_.get();
946 } 944 }
947 945
948 } // namespace cc 946 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/layer_tree_test.h ('k') | cc/trees/layer_tree_host_common_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698