cc: Remove the ability to specify a GL texture target

content/browser/gpu/browser_gpu_memory_buffer_manager.cc

 // Copyright 2014 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.
 
 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 211 matching lines @@
 }
 
 // static
 uint32 BrowserGpuMemoryBufferManager::GetImageTextureTarget(
     gfx::BufferFormat format,
     gfx::BufferUsage usage) {
   GpuMemoryBufferConfigurationSet native_configurations =
       GetNativeGpuMemoryBufferConfigurations();
   if (native_configurations.find(std::make_pair(format, usage)) ==
       native_configurations.end()) {
-    return GL_TEXTURE_2D;
+    return 0;

[reveman, 2015/10/29 14:11:39]

I don't think this is correct. This is supposed to return the target used for
non-native buffers, GL_TEXTURE_2D.

[ccameron, 2015/10/29 19:08:29]

Yeah, this was a bad idea and I should have left it out of this CL.

In general, I'd like there to be a way for the ResourceProvider to be able to
tell if a given GMB can become an overlay, but let's solve that problem later.

   }
 
   switch (GpuMemoryBufferFactory::GetNativeType()) {
     case gfx::SURFACE_TEXTURE_BUFFER:
     case gfx::OZONE_NATIVE_PIXMAP:
       // GPU memory buffers that are shared with the GL using EGLImages
       // require TEXTURE_EXTERNAL_OES.
       return GL_TEXTURE_EXTERNAL_OES;
     case gfx::IO_SURFACE_BUFFER:
       // IOSurface backed images require GL_TEXTURE_RECTANGLE_ARB.
       return GL_TEXTURE_RECTANGLE_ARB;
     case gfx::SHARED_MEMORY_BUFFER:
-      return GL_TEXTURE_2D;
+      return 0;

[reveman, 2015/10/29 14:11:39]

This could be a NOTREACHED case now that the shm factory has been removed. Can
you merge this with the gfx::EMPTY_BUFFER case while here?

     case gfx::EMPTY_BUFFER:
       NOTREACHED();
-      return GL_TEXTURE_2D;
+      return 0;
   }
 
   NOTREACHED();
-  return GL_TEXTURE_2D;
+  return 0;
 }
 
 scoped_ptr<gfx::GpuMemoryBuffer>
 BrowserGpuMemoryBufferManager::AllocateGpuMemoryBuffer(const gfx::Size& size,
                                                        gfx::BufferFormat format,
                                                        gfx::BufferUsage usage) {
   return AllocateGpuMemoryBufferForSurface(size, format, usage, 0);
 }
 
 scoped_ptr<gfx::GpuMemoryBuffer>
@@ skipping 475 matching lines @@
     return gpu_client_tracing_id_;
   }
 
   // In normal cases, |client_id| is a child process id, so we can perform
   // the standard conversion.
   return ChildProcessHostImpl::ChildProcessUniqueIdToTracingProcessId(
       client_id);
 }
 
 }  // namespace content