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

Unified Diff: content/renderer/render_thread_impl_browsertest.cc

Issue 2120713002: Fix use_image_texture_target inconsistencies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix content browsertests Created 4 years, 5 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 | « content/renderer/render_thread_impl.cc ('k') | content/test/fake_compositor_dependencies.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_thread_impl_browsertest.cc
diff --git a/content/renderer/render_thread_impl_browsertest.cc b/content/renderer/render_thread_impl_browsertest.cc
index cbed00c078e5eecb902bb451eb4e7a9eb5073767..46ee9ea66996aa627ef6c5987c8e8e3292f193dc 100644
--- a/content/renderer/render_thread_impl_browsertest.cc
+++ b/content/renderer/render_thread_impl_browsertest.cc
@@ -16,6 +16,7 @@
#include "base/single_thread_task_runner.h"
#include "base/strings/string_number_conversions.h"
#include "base/threading/thread_task_runner_handle.h"
+#include "cc/output/buffer_to_texture_target_map.h"
#include "components/scheduler/renderer/renderer_scheduler.h"
#include "content/app/mojo/mojo_init.h"
#include "content/common/in_process_child_thread_params.h"
@@ -167,14 +168,10 @@ class RenderThreadImplBrowserTest : public testing::Test {
base::CommandLine::StringVector old_argv = cmd->argv();
cmd->AppendSwitchASCII(switches::kNumRasterThreads, "1");
- std::string image_targets;
- for (size_t format = 0;
- format < static_cast<size_t>(gfx::BufferFormat::LAST) + 1; format++) {
- if (!image_targets.empty())
- image_targets += ",";
- image_targets += base::UintToString(GL_TEXTURE_2D);
- }
- cmd->AppendSwitchASCII(switches::kContentImageTextureTarget, image_targets);
+ cmd->AppendSwitchASCII(
+ switches::kContentImageTextureTarget,
+ cc::BufferToTextureTargetMapToString(
+ cc::DefaultBufferToTextureTargetMapForTesting()));
std::unique_ptr<scheduler::RendererScheduler> renderer_scheduler =
scheduler::RendererScheduler::Create();
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | content/test/fake_compositor_dependencies.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698