ui: Add RGBX_8888 buffer format.

ui/gl/gl_image_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 "ui/gl/gl_image_shared_memory.h"
 
 #include "base/logging.h"
 #include "base/memory/shared_memory.h"
 #include "base/numerics/safe_math.h"
 #include "base/process/process_handle.h"
 #include "base/trace_event/memory_allocator_dump.h"
 #include "base/trace_event/memory_dump_manager.h"
 #include "base/trace_event/process_memory_dump.h"
+#include "ui/gfx/buffer_format_util.h"
 
 namespace gfx {
-namespace {
-
-// Returns true if the size is valid and false otherwise.
-bool SizeInBytes(const Size& size, BufferFormat format, size_t* size_in_bytes) {
-  if (size.IsEmpty())
-    return false;
-
-  size_t stride_in_bytes = 0;
-  if (!GLImageMemory::StrideInBytes(size.width(), format, &stride_in_bytes))
-    return false;
-  base::CheckedNumeric<size_t> s = stride_in_bytes;
-  s *= size.height();
-  if (!s.IsValid())
-    return false;
-  *size_in_bytes = s.ValueOrDie();
-  return true;
-}
-
-}  // namespace
 
 GLImageSharedMemory::GLImageSharedMemory(const Size& size,
                                          unsigned internalformat)
     : GLImageMemory(size, internalformat) {}
 
 GLImageSharedMemory::~GLImageSharedMemory() {
   DCHECK(!shared_memory_);
 }
 
 bool GLImageSharedMemory::Initialize(const base::SharedMemoryHandle& handle,
                                      GenericSharedMemoryId shared_memory_id,
                                      BufferFormat format) {
   size_t size_in_bytes;
-  if (!SizeInBytes(GetSize(), format, &size_in_bytes))
+  if (!BufferSizeForBufferFormatChecked(GetSize(), format, &size_in_bytes))
     return false;
 
   if (!base::SharedMemory::IsHandleValid(handle))
     return false;
 
   base::SharedMemory shared_memory(handle, true);
 
   // Duplicate the handle.
   base::SharedMemoryHandle duped_shared_memory_handle;
   if (!shared_memory.ShareToProcess(base::GetCurrentProcessHandle(),
@@ skipping 24 matching lines @@
   GLImageMemory::Destroy(have_context);
   shared_memory_.reset();
 }
 
 void GLImageSharedMemory::OnMemoryDump(
     base::trace_event::ProcessMemoryDump* pmd,
     uint64_t process_tracing_id,
     const std::string& dump_name) {
   size_t size_in_bytes = 0;
 
-  if (shared_memory_) {
-    bool result = SizeInBytes(GetSize(), format(), &size_in_bytes);
-    DCHECK(result);
-  }
+  if (shared_memory_)
+    size_in_bytes = BufferSizeForBufferFormat(GetSize(), format());
 
   // Dump under "/shared_memory", as the base class may also dump to
   // "/texture_memory".
   base::trace_event::MemoryAllocatorDump* dump =
       pmd->CreateAllocatorDump(dump_name + "/shared_memory");
   dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
                   base::trace_event::MemoryAllocatorDump::kUnitsBytes,
                   static_cast<uint64_t>(size_in_bytes));
 
   auto guid = GetGenericSharedMemoryGUIDForTracing(process_tracing_id,
                                                    shared_memory_id_);
   pmd->CreateSharedGlobalAllocatorDump(guid);
   pmd->AddOwnershipEdge(dump->guid(), guid);
 }
 
 }  // namespace gfx