Re-land: ui: Add custom stride support to GLImageMemory.

ui/gl/gl_image_shared_memory.cc

Index: ui/gl/gl_image_shared_memory.cc
diff --git a/ui/gl/gl_image_shared_memory.cc b/ui/gl/gl_image_shared_memory.cc
index 6ea5553229e825b7c509afc9fd33aa08e27bfc50..21c72c11b2b5007fdc208a2ccc48f7f223376086 100644
--- a/ui/gl/gl_image_shared_memory.cc
+++ b/ui/gl/gl_image_shared_memory.cc
@@ -28,9 +28,14 @@ bool GLImageSharedMemory::Initialize(
     const base::SharedMemoryHandle& handle,
     gfx::GenericSharedMemoryId shared_memory_id,
     gfx::BufferFormat format,
-    size_t offset) {
-  size_t size_in_bytes;
-  if (!BufferSizeForBufferFormatChecked(GetSize(), format, &size_in_bytes))
+    size_t offset,
+    size_t stride) {
+  if (NumberOfPlanesForBufferFormat(format) != 1)
+    return false;
+
+  base::CheckedNumeric<size_t> checked_size = stride;
+  checked_size *= GetSize().height();
+  if (!checked_size.IsValid())
     return false;
 
   if (!base::SharedMemory::IsHandleValid(handle))
@@ -52,22 +57,21 @@ bool GLImageSharedMemory::Initialize(
   size_t map_offset = base::SysInfo::VMAllocationGranularity() *
                       (offset / base::SysInfo::VMAllocationGranularity());
 
-  base::CheckedNumeric<size_t> checked_size_to_map_in_bytes = size_in_bytes;
-  checked_size_to_map_in_bytes += memory_offset;
-  if (!checked_size_to_map_in_bytes.IsValid())
+  checked_size += memory_offset;
+  if (!checked_size.IsValid())
     return false;
 
   scoped_ptr<base::SharedMemory> duped_shared_memory(
       new base::SharedMemory(duped_shared_memory_handle, true));
   if (!duped_shared_memory->MapAt(static_cast<off_t>(map_offset),
-                                  checked_size_to_map_in_bytes.ValueOrDie())) {
+                                  checked_size.ValueOrDie())) {
     DVLOG(0) << "Failed to map shared memory.";
     return false;
   }
 
   if (!GLImageMemory::Initialize(
           static_cast<uint8_t*>(duped_shared_memory->memory()) + memory_offset,
-          format)) {
+          format, stride)) {

[Peter Mayo, 2015/11/10 16:47:52]

FAILED: ninja -t msvc -e environment.x64 -- C:\b\build\goma/gomacc
"C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64\cl.exe" /nologo
/showIncludes /FC
@obj\ui\gl\gl_unittests.gl_image_shared_memory_unittest.obj.rsp /c
..\..\ui\gl\gl_image_shared_memory_unittest.cc
/Foobj\ui\gl\gl_unittests.gl_image_shared_memory_unittest.obj
/Fdobj\ui\gl\gl_unittests.cc.pdb 
c:\b\build\slave\win_x64_builder__dbg_\build\src\ui\gl\gl_image_shared_memory_unittest.cc(76)
: error C2220: warning treated as error - no 'object' file generated
c:\b\build\slave\win_x64_builder__dbg_\build\src\ui\gl\gl_image_shared_memory_unittest.cc(76)
: warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss
of data
ninja: build stopped: subcommand failed.


on
https://build.chromium.org/p/chromium.win/builders/Win%20x64%20Builder%20%28d...

     return false;
   }
 
@@ -89,7 +93,7 @@ void GLImageSharedMemory::OnMemoryDump(
   size_t size_in_bytes = 0;
 
   if (shared_memory_)
-    size_in_bytes = BufferSizeForBufferFormat(GetSize(), format());
+    size_in_bytes = stride() * GetSize().height();
 
   // Dump under "/shared_memory", as the base class may also dump to
   // "/texture_memory".