Re-land: ui: Move GLImage::BindTexImage fallback from GLImage implementations to GLES2CmdDecoder.

components/mus/gles2/command_buffer_local.cc

 // Copyright 2015 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 "components/mus/gles2/command_buffer_local.h"
 
 #include "base/bind.h"
+#include "base/memory/shared_memory.h"
 #include "components/mus/gles2/command_buffer_local_client.h"
 #include "components/mus/gles2/gpu_memory_tracker.h"
 #include "components/mus/gles2/mojo_gpu_memory_buffer.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/gpu_scheduler.h"
 #include "gpu/command_buffer/service/image_factory.h"
 #include "gpu/command_buffer/service/image_manager.h"
 #include "gpu/command_buffer/service/memory_tracking.h"
 #include "gpu/command_buffer/service/shader_translator_cache.h"
 #include "gpu/command_buffer/service/transfer_buffer_manager.h"
 #include "gpu/command_buffer/service/valuebuffer_manager.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/gl/gl_context.h"
-#include "ui/gl/gl_image_memory.h"
+#include "ui/gl/gl_image_shared_memory.h"
 #include "ui/gl/gl_surface.h"
 
 namespace mus {
 
 const unsigned int GL_MAP_CHROMIUM = 0x78F1;
 
 CommandBufferLocal::CommandBufferLocal(CommandBufferLocalClient* client,
                                        gfx::AcceleratedWidget widget,
                                        const scoped_refptr<GpuState>& gpu_state)
     : widget_(widget),
@@ skipping 95 matching lines @@
   return decoder_->GetCapabilities();
 }
 
 int32_t CommandBufferLocal::CreateImage(ClientBuffer buffer,
                                         size_t width,
                                         size_t height,
                                         unsigned internalformat) {
   MojoGpuMemoryBufferImpl* gpu_memory_buffer =
       MojoGpuMemoryBufferImpl::FromClientBuffer(buffer);
 
-  scoped_refptr<gfx::GLImageMemory> image(new gfx::GLImageMemory(
+  gfx::GpuMemoryBufferHandle handle = gpu_memory_buffer->GetHandle();
+  scoped_refptr<gfx::GLImageSharedMemory> image(new gfx::GLImageSharedMemory(
       gfx::Size(static_cast<int>(width), static_cast<int>(height)),
       internalformat));
-  if (!image->Initialize(
-          static_cast<const unsigned char*>(gpu_memory_buffer->GetMemory()),
-          gpu_memory_buffer->GetFormat())) {
+  if (!image->Initialize(base::SharedMemory::DuplicateHandle(handle.handle),
+                         handle.id, gpu_memory_buffer->GetFormat())) {
     return -1;
   }
 
   static int32 next_id = 1;
   int32 new_id = next_id++;
 
   gpu::gles2::ImageManager* image_manager = decoder_->GetImageManager();
   DCHECK(image_manager);
   image_manager->AddImage(image.get(), new_id);
   return new_id;
@@ skipping 173 matching lines @@
 void CommandBufferLocal::OnContextLost(uint32_t reason) {
   if (client_)
     client_->DidLoseContext();
 }
 
 void CommandBufferLocal::OnSyncPointRetired() {
   scheduler_->SetScheduled(true);
 }
 
 }  // namespace mus