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

Unified Diff: cc/trees/layer_tree_host_unittest.cc

Issue 2857363004: Add buffer_to_texture_target_map to LayerTreeSettings (Closed)
Patch Set: Address comments in CompositorImpl Created 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/layer_tree_host_perftest.cc ('k') | cc/trees/layer_tree_host_unittest_context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_unittest.cc
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 9a657f521e44855564deaf301720fa1272c7c054..b74965d7d81121fe8bb58852f0e0446c080f44fa 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -442,6 +442,7 @@ SINGLE_THREAD_TEST_F(LayerTreeHostTestReadyToDrawVisibility);
class LayerTreeHostContextCacheTest : public LayerTreeHostTest {
public:
std::unique_ptr<TestCompositorFrameSink> CreateCompositorFrameSink(
+ const RendererSettings& renderer_settings,
scoped_refptr<ContextProvider> compositor_context_provider,
scoped_refptr<ContextProvider> worker_context_provider) override {
// Create the main ContextProvider with a MockContextSupport.
@@ -465,7 +466,7 @@ class LayerTreeHostContextCacheTest : public LayerTreeHostTest {
SetAggressivelyFreeResources(false));
return LayerTreeHostTest::CreateCompositorFrameSink(
- std::move(test_main_context_provider),
+ renderer_settings, std::move(test_main_context_provider),
std::move(test_worker_context_provider));
}
@@ -3345,6 +3346,7 @@ class LayerTreeHostTestAbortedCommitDoesntStallSynchronousCompositor
}
std::unique_ptr<TestCompositorFrameSink> CreateCompositorFrameSink(
+ const RendererSettings& renderer_settings,
scoped_refptr<ContextProvider> compositor_context_provider,
scoped_refptr<ContextProvider> worker_context_provider) override {
auto on_draw_callback = base::Bind(
@@ -3353,8 +3355,7 @@ class LayerTreeHostTestAbortedCommitDoesntStallSynchronousCompositor
base::Unretained(this));
auto frame_sink = base::MakeUnique<OnDrawCompositorFrameSink>(
compositor_context_provider, std::move(worker_context_provider),
- shared_bitmap_manager(), gpu_memory_buffer_manager(),
- layer_tree_host()->GetSettings().renderer_settings,
+ shared_bitmap_manager(), gpu_memory_buffer_manager(), renderer_settings,
ImplThreadTaskRunner(), false /* synchronous_composite */,
std::move(on_draw_callback));
compositor_frame_sink_ = frame_sink.get();
@@ -5475,13 +5476,15 @@ MULTI_THREAD_TEST_F(LayerTreeHostTestEmptyLayerGpuRasterization);
class LayerTreeHostWithGpuRasterizationTest : public LayerTreeHostTest {
protected:
std::unique_ptr<TestCompositorFrameSink> CreateCompositorFrameSink(
+ const RendererSettings& renderer_settings,
scoped_refptr<ContextProvider> compositor_context_provider,
scoped_refptr<ContextProvider> worker_context_provider) override {
auto context = TestWebGraphicsContext3D::Create();
context->set_gpu_rasterization(true);
auto context_provider = TestContextProvider::Create(std::move(context));
return LayerTreeHostTest::CreateCompositorFrameSink(
- std::move(context_provider), std::move(worker_context_provider));
+ renderer_settings, std::move(context_provider),
+ std::move(worker_context_provider));
}
};
@@ -5557,6 +5560,7 @@ class LayerTreeHostTestGpuRasterizationReenabled
}
std::unique_ptr<TestCompositorFrameSink> CreateCompositorFrameSink(
+ const RendererSettings& renderer_settings,
scoped_refptr<ContextProvider> compositor_context_provider,
scoped_refptr<ContextProvider> worker_context_provider) override {
std::unique_ptr<TestWebGraphicsContext3D> context =
@@ -5565,7 +5569,8 @@ class LayerTreeHostTestGpuRasterizationReenabled
context->set_gpu_rasterization(true);
compositor_context_provider =
TestContextProvider::Create(std::move(context));
- return LayerTreeTest::CreateCompositorFrameSink(compositor_context_provider,
+ return LayerTreeTest::CreateCompositorFrameSink(renderer_settings,
+ compositor_context_provider,
worker_context_provider);
}
@@ -5970,6 +5975,7 @@ class LayerTreeHostTestSynchronousCompositeSwapPromise
}
std::unique_ptr<TestCompositorFrameSink> CreateCompositorFrameSink(
+ const RendererSettings& renderer_settings,
scoped_refptr<ContextProvider> compositor_context_provider,
scoped_refptr<ContextProvider> worker_context_provider) override {
constexpr bool disable_display_vsync = false;
@@ -5978,8 +5984,7 @@ class LayerTreeHostTestSynchronousCompositeSwapPromise
!layer_tree_host()->GetSettings().single_thread_proxy_scheduler;
return base::MakeUnique<TestCompositorFrameSink>(
compositor_context_provider, std::move(worker_context_provider),
- shared_bitmap_manager(), gpu_memory_buffer_manager(),
- layer_tree_host()->GetSettings().renderer_settings,
+ shared_bitmap_manager(), gpu_memory_buffer_manager(), renderer_settings,
ImplThreadTaskRunner(), synchronous_composite, disable_display_vsync);
}
« no previous file with comments | « cc/trees/layer_tree_host_perftest.cc ('k') | cc/trees/layer_tree_host_unittest_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698