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

Unified Diff: content/renderer/render_thread_impl.cc

Issue 963223002: ui: Pass correct image texture target and one-copy settings to cc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: usetexturetarget: exportswitch Created 5 years, 10 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/public/common/content_switches.h ('k') | content/renderer/render_thread_impl_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 35bd5e3f4e6f931153c499fdd4310855ce83febd..a5d7e58f3518103e619b12796fa08729eb116095 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -570,19 +570,11 @@ void RenderThreadImpl::Init() {
is_elastic_overscroll_enabled_ = false;
#endif
- use_image_texture_target_ = GL_TEXTURE_2D;
- if (command_line.HasSwitch(switches::kUseImageTextureTarget)) {
- std::string target_string =
- command_line.GetSwitchValueASCII(switches::kUseImageTextureTarget);
- const unsigned targets[] = {
- GL_TEXTURE_RECTANGLE_ARB,
- GL_TEXTURE_EXTERNAL_OES
- };
- for (auto target : targets) {
- if (target_string == gpu::gles2::GLES2Util::GetStringEnum(target))
- use_image_texture_target_ = target;
- }
- }
+ std::string image_texture_target_string =
+ command_line.GetSwitchValueASCII(switches::kUseImageTextureTarget);
+ bool parsed_image_texture_target = base::StringToUint(
+ image_texture_target_string, &use_image_texture_target_);
+ DCHECK(parsed_image_texture_target);
if (command_line.HasSwitch(switches::kDisableLCDText)) {
is_lcd_text_enabled_ = false;
« no previous file with comments | « content/public/common/content_switches.h ('k') | content/renderer/render_thread_impl_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698