Add R_8 GPU memory buffers format.

content/common/gpu/client/gpu_memory_buffer_impl.cc

 // Copyright 2013 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.h"
 
 #include "base/logging.h"
 #include "base/numerics/safe_math.h"
 #include "content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h"
 #include "ui/gl/gl_bindings.h"
@@ skipping 62 matching lines @@
 // static
 GpuMemoryBufferImpl* GpuMemoryBufferImpl::FromClientBuffer(
     ClientBuffer buffer) {
   return reinterpret_cast<GpuMemoryBufferImpl*>(buffer);
 }
 
 // static
 bool GpuMemoryBufferImpl::StrideInBytes(size_t width,
                                         Format format,
                                         size_t* stride_in_bytes) {
-  base::CheckedNumeric<size_t> s = width;
+  base::CheckedNumeric<size_t> checked_stride = width;
   switch (format) {
-    case ATCIA:
-    case DXT5:
+    case GpuMemoryBuffer::R_8:

[reveman, 2015/04/08 02:57:28]

hm, doesn't really matter as we'll clean this up in a follow up but this is now
adding part of the prefix to a function where it was not previously used.
intentional?

[Daniele Castagna, 2015/04/08 19:16:00]

Not intentional, fixed.

+      checked_stride += 3;
+      if (!checked_stride.IsValid())
+        return false;
+      *stride_in_bytes = checked_stride.ValueOrDie() & ~0x3;
+      return true;
+    case GpuMemoryBuffer::ATCIA:
+    case GpuMemoryBuffer::DXT5:
       *stride_in_bytes = width;
       return true;
-    case ATC:
-    case DXT1:
-    case ETC1:
-      DCHECK_EQ(width % 2, 0U);
-      s /= 2;
-      if (!s.IsValid())
+    case GpuMemoryBuffer::ATC:
+    case GpuMemoryBuffer::DXT1:
+    case GpuMemoryBuffer::ETC1:
+      DCHECK_EQ(width % 2, 0u);
+      *stride_in_bytes = width / 2;
+      return true;
+    case GpuMemoryBuffer::RGBA_8888:
+    case GpuMemoryBuffer::RGBX_8888:
+    case GpuMemoryBuffer::BGRA_8888:
+      checked_stride *= 4;
+      if (!checked_stride.IsValid())
         return false;
-
-      *stride_in_bytes = s.ValueOrDie();
-      return true;
-    case RGBA_8888:
-    case RGBX_8888:
-    case BGRA_8888:
-      s *= 4;
-      if (!s.IsValid())
-        return false;
-
-      *stride_in_bytes = s.ValueOrDie();
+      *stride_in_bytes = checked_stride.ValueOrDie();
       return true;
   }
-
   NOTREACHED();
   return false;
 }
 
 // static
 size_t GpuMemoryBufferImpl::NumberOfPlanesForGpuMemoryBufferFormat(
     gfx::GpuMemoryBuffer::Format format) {
   switch (format) {
     case gfx::GpuMemoryBuffer::Format::ATC:
     case gfx::GpuMemoryBuffer::Format::ATCIA:
     case gfx::GpuMemoryBuffer::Format::DXT1:
     case gfx::GpuMemoryBuffer::Format::DXT5:
     case gfx::GpuMemoryBuffer::Format::ETC1:
+    case gfx::GpuMemoryBuffer::Format::R_8:
     case gfx::GpuMemoryBuffer::Format::RGBA_8888:
     case gfx::GpuMemoryBuffer::Format::RGBX_8888:
     case gfx::GpuMemoryBuffer::Format::BGRA_8888:
       return 1;
     default:
       NOTREACHED();
       return 0;
   }
 }
 
 gfx::GpuMemoryBuffer::Format GpuMemoryBufferImpl::GetFormat() const {
   return format_;
 }
 
 bool GpuMemoryBufferImpl::IsMapped() const {
   return mapped_;
 }
 
 ClientBuffer GpuMemoryBufferImpl::AsClientBuffer() {
   return reinterpret_cast<ClientBuffer>(this);
 }
 
 }  // namespace content