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

Unified Diff: ui/compositor/test/fake_context_factory.cc

Issue 2879463002: Initialize RendererSettings in ContextFactory (Closed)
Patch Set: Fix FakeContextFactory 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
Index: ui/compositor/test/fake_context_factory.cc
diff --git a/ui/compositor/test/fake_context_factory.cc b/ui/compositor/test/fake_context_factory.cc
index a1f4219b75a7724c53ab2dd57ea956d2cb6846e9..2f96b7bcc0070c90b113bcae29717cd2d82d44d6 100644
--- a/ui/compositor/test/fake_context_factory.cc
+++ b/ui/compositor/test/fake_context_factory.cc
@@ -4,15 +4,57 @@
#include "ui/compositor/test/fake_context_factory.h"
+#include "base/command_line.h"
#include "base/threading/thread_task_runner_handle.h"
+#include "cc/base/switches.h"
#include "cc/output/compositor_frame.h"
#include "cc/output/compositor_frame_sink_client.h"
#include "cc/scheduler/begin_frame_source.h"
#include "cc/scheduler/delay_based_time_source.h"
#include "cc/test/fake_compositor_frame_sink.h"
+#include "ui/compositor/compositor_switches.h"
+#include "ui/display/display_switches.h"
+#include "ui/gfx/switches.h"
namespace ui {
+FakeContextFactory::FakeContextFactory() {
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+ renderer_settings_.partial_swap_enabled =
danakj 2017/05/11 15:17:15 Most of these are not needed for tests, I would ma
Alex Z. 2017/05/11 19:25:22 I set it to default values since nothing using eit
danakj 2017/05/11 20:10:16 I think test code not using switches sounds good.
+ !command_line->HasSwitch(switches::kUIDisablePartialSwap);
+#if defined(OS_WIN)
+ renderer_settings_.finish_rendering_on_resize = true;
+#elif defined(OS_MACOSX)
+ renderer_settings_.release_overlay_resources_after_gpu_query = true;
+#endif
+ renderer_settings_.gl_composited_texture_quad_border =
+ command_line->HasSwitch(cc::switches::kGlCompositedTextureQuadBorder);
+ renderer_settings_.show_overdraw_feedback =
+ command_line->HasSwitch(cc::switches::kShowOverdrawFeedback);
+ if (command_line->HasSwitch(switches::kUIEnableRGBA4444Textures))
+ renderer_settings_.preferred_tile_format = cc::RGBA_4444;
+ renderer_settings_.enable_color_correct_rendering =
+ command_line->HasSwitch(switches::kEnableColorCorrectRendering) ||
+ command_line->HasSwitch(switches::kEnableHDR);
+ // Populate buffer_to_texture_target_map for all buffer usage/formats.
+ for (int usage_idx = 0; usage_idx <= static_cast<int>(gfx::BufferUsage::LAST);
+ ++usage_idx) {
+ gfx::BufferUsage usage = static_cast<gfx::BufferUsage>(usage_idx);
+ for (int format_idx = 0;
+ format_idx <= static_cast<int>(gfx::BufferFormat::LAST);
+ ++format_idx) {
+ gfx::BufferFormat format = static_cast<gfx::BufferFormat>(format_idx);
+ uint32_t target = GL_TEXTURE_2D;
+ renderer_settings_
+ .buffer_to_texture_target_map[std::make_pair(usage, format)] = target;
+ }
+ }
+ renderer_settings_.disallow_non_exact_resource_reuse =
+ command_line->HasSwitch(cc::switches::kDisallowNonExactResourceReuse);
+}
+
+FakeContextFactory::~FakeContextFactory() = default;
+
const cc::CompositorFrame& FakeContextFactory::GetLastCompositorFrame() const {
return *frame_sink_->last_sent_frame();
}
@@ -37,11 +79,6 @@ double FakeContextFactory::GetRefreshRate() const {
return 200.0;
}
-uint32_t FakeContextFactory::GetImageTextureTarget(gfx::BufferFormat format,
- gfx::BufferUsage usage) {
- return GL_TEXTURE_2D;
-}
-
gpu::GpuMemoryBufferManager* FakeContextFactory::GetGpuMemoryBufferManager() {
return &gpu_memory_buffer_manager_;
}
@@ -50,4 +87,8 @@ cc::TaskGraphRunner* FakeContextFactory::GetTaskGraphRunner() {
return &task_graph_runner_;
}
+const cc::RendererSettings& FakeContextFactory::GetRendererSettings() const {
+ return renderer_settings_;
+}
+
} // namespace ui

Powered by Google App Engine
This is Rietveld 408576698