Revert of Update GPU memory buffers to use StrideInBytes internally.

content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.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/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h"
 
 #include "base/bind.h"
 #include "base/numerics/safe_math.h"
 #include "ui/gl/gl_bindings.h"
 
@@ skipping 17 matching lines @@
 
 GpuMemoryBufferImplSharedMemory::~GpuMemoryBufferImplSharedMemory() {
 }
 
 // static
 scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImplSharedMemory::Create(
     gfx::GpuMemoryBufferId id,
     const gfx::Size& size,
     Format format) {
   scoped_ptr<base::SharedMemory> shared_memory(new base::SharedMemory());
-
-  size_t stride_in_bytes = 0;
-  if (!StrideInBytes(size.width(), format, &stride_in_bytes))
-    return scoped_ptr<GpuMemoryBufferImpl>();
-
-  base::CheckedNumeric<size_t> size_in_bytes = stride_in_bytes;
-  size_in_bytes *= size.height();
-  if (!size_in_bytes.IsValid())
-    return scoped_ptr<GpuMemoryBufferImpl>();
-
-  if (!shared_memory->CreateAnonymous(size_in_bytes.ValueOrDie()))
+  if (!shared_memory->CreateAnonymous(size.GetArea() * BytesPerPixel(format)))
     return scoped_ptr<GpuMemoryBufferImpl>();
 
   return make_scoped_ptr(new GpuMemoryBufferImplSharedMemory(
       id, size, format, base::Bind(&Noop), shared_memory.Pass()));
 }
 
 // static
 gfx::GpuMemoryBufferHandle
 GpuMemoryBufferImplSharedMemory::AllocateForChildProcess(
     gfx::GpuMemoryBufferId id,
     const gfx::Size& size,
     Format format,
     base::ProcessHandle child_process) {
-  size_t stride_in_bytes = 0;
-  if (!StrideInBytes(size.width(), format, &stride_in_bytes))
-    return gfx::GpuMemoryBufferHandle();
-
-  base::CheckedNumeric<int> buffer_size = stride_in_bytes;
+  base::CheckedNumeric<int> buffer_size = size.width();
   buffer_size *= size.height();
+  buffer_size *= BytesPerPixel(format);
   if (!buffer_size.IsValid())
     return gfx::GpuMemoryBufferHandle();
 
   base::SharedMemory shared_memory;
   if (!shared_memory.CreateAnonymous(buffer_size.ValueOrDie()))
     return gfx::GpuMemoryBufferHandle();
 
   gfx::GpuMemoryBufferHandle handle;
   handle.type = gfx::SHARED_MEMORY_BUFFER;
   handle.id = id;
@@ skipping 29 matching lines @@
     case RGBX_8888:
       return false;
   }
 
   NOTREACHED();
   return false;
 }
 
 void* GpuMemoryBufferImplSharedMemory::Map() {
   DCHECK(!mapped_);
-
-  size_t stride_in_bytes = 0;
-  if (!StrideInBytes(size_.width(), format_, &stride_in_bytes))
-    return NULL;
-
-  base::CheckedNumeric<size_t> size_in_bytes = stride_in_bytes;
-  size_in_bytes *= size_.height();
-  if (!size_in_bytes.IsValid())
-    return NULL;
-
-  if (!shared_memory_->Map(size_in_bytes.ValueOrDie()))
+  if (!shared_memory_->Map(size_.GetArea() * BytesPerPixel(format_)))
     return NULL;
   mapped_ = true;
   return shared_memory_->memory();
 }
 
 void GpuMemoryBufferImplSharedMemory::Unmap() {
   DCHECK(mapped_);
   shared_memory_->Unmap();
   mapped_ = false;
 }
 
 uint32 GpuMemoryBufferImplSharedMemory::GetStride() const {
-  size_t stride_in_bytes = 0;
-  DCHECK(StrideInBytes(size_.width(), format_, &stride_in_bytes));
-  return stride_in_bytes;
+  return size_.width() * BytesPerPixel(format_);
 }
 
 gfx::GpuMemoryBufferHandle GpuMemoryBufferImplSharedMemory::GetHandle() const {
   gfx::GpuMemoryBufferHandle handle;
   handle.type = gfx::SHARED_MEMORY_BUFFER;
   handle.id = id_;
   handle.handle = shared_memory_->handle();
   return handle;
 }
 
 }  // namespace content