ui: Pass correct image texture target and one-copy settings to cc.

content/browser/renderer_host/render_process_host_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Represents the browser side of the browser <--> renderer communication
 // channel. There will be one RenderProcessHost per renderer process.
 
 #include "content/browser/renderer_host/render_process_host_impl.h"
 
 #include <algorithm>
@@ skipping 1090 matching lines @@
   DCHECK_IMPLIES(IsZeroCopyUploadEnabled(), !IsOneCopyUploadEnabled());
   DCHECK_IMPLIES(IsOneCopyUploadEnabled(), !IsZeroCopyUploadEnabled());
   if (IsZeroCopyUploadEnabled())
     command_line->AppendSwitch(switches::kEnableZeroCopy);
   if (!IsOneCopyUploadEnabled())
     command_line->AppendSwitch(switches::kDisableOneCopy);
 
   if (IsForceGpuRasterizationEnabled())
     command_line->AppendSwitch(switches::kForceGpuRasterization);
 
-  if (BrowserGpuChannelHostFactory::IsGpuMemoryBufferFactoryUsageEnabled(
-          gfx::GpuMemoryBuffer::MAP)) {
-    std::vector<gfx::GpuMemoryBufferType> supported_types;
-    GpuMemoryBufferFactory::GetSupportedTypes(&supported_types);
-    DCHECK(!supported_types.empty());
-
-    // The GPU service will always use the preferred type.
-    gfx::GpuMemoryBufferType type = supported_types[0];
-
-    switch (type) {
-      case gfx::SURFACE_TEXTURE_BUFFER:
-        // Surface texture backed GPU memory buffers require
-        // TEXTURE_EXTERNAL_OES.
-        command_line->AppendSwitchASCII(
-            switches::kUseImageTextureTarget,
-            gpu::gles2::GLES2Util::GetStringEnum(GL_TEXTURE_EXTERNAL_OES));
-        break;
-      case gfx::IO_SURFACE_BUFFER:
-        // IOSurface backed images require GL_TEXTURE_RECTANGLE_ARB.
-        command_line->AppendSwitchASCII(
-            switches::kUseImageTextureTarget,
-            gpu::gles2::GLES2Util::GetStringEnum(GL_TEXTURE_RECTANGLE_ARB));
-        break;
-      default:
-        break;
-    }
-  }
+  command_line->AppendSwitchASCII(
+      switches::kUseImageTextureTarget,
+      base::UintToString(
+          BrowserGpuChannelHostFactory::GetImageTextureTarget()));
 
   // Appending disable-gpu-feature switches due to software rendering list.
   GpuDataManagerImpl* gpu_data_manager = GpuDataManagerImpl::GetInstance();
   DCHECK(gpu_data_manager);
   gpu_data_manager->AppendRendererCommandLine(command_line);
 }
 
 void RenderProcessHostImpl::AppendRendererCommandLine(
     base::CommandLine* command_line) const {
   // Pass the process type first, so it shows first in process listings.
@@ skipping 1265 matching lines @@
   if (worker_ref_count_ == 0)
     Cleanup();
 }
 
 void RenderProcessHostImpl::GetAudioOutputControllers(
     const GetAudioOutputControllersCallback& callback) const {
   audio_renderer_host()->GetOutputControllers(callback);
 }
 
 }  // namespace content