Revert of ui: Add custom stride support to GLImageMemory.

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/buffer_format_util.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_image_shared_memory.h"
 #include "ui/gl/gl_surface.h"
 
 namespace mus {
 
 const unsigned int GL_READ_WRITE_CHROMIUM = 0x78F2;
 
 CommandBufferLocal::CommandBufferLocal(CommandBufferLocalClient* client,
@@ skipping 101 matching lines @@
                                         size_t height,
                                         unsigned internalformat) {
   MojoGpuMemoryBufferImpl* gpu_memory_buffer =
       MojoGpuMemoryBufferImpl::FromClientBuffer(buffer);
 
   gfx::GpuMemoryBufferHandle handle = gpu_memory_buffer->GetHandle();
   scoped_refptr<gl::GLImageSharedMemory> image(new gl::GLImageSharedMemory(
       gfx::Size(static_cast<int>(width), static_cast<int>(height)),
       internalformat));
   if (!image->Initialize(base::SharedMemory::DuplicateHandle(handle.handle),
-                         handle.id, gpu_memory_buffer->GetFormat(), 0,
-                         gfx::RowSizeForBufferFormat(
-                             width, gpu_memory_buffer->GetFormat(), 0))) {
+                         handle.id, gpu_memory_buffer->GetFormat(), 0)) {
     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 175 matching lines @@
 void CommandBufferLocal::OnContextLost(uint32_t reason) {
   if (client_)
     client_->DidLoseContext();
 }
 
 void CommandBufferLocal::OnSyncPointRetired() {
   scheduler_->SetScheduled(true);
 }
 
 }  // namespace mus