Remove unused fields from //content.

content/common/host_shared_bitmap_manager.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/host_shared_bitmap_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/trace_event/process_memory_dump.h"
 #include "build/build_config.h"
 #include "content/common/view_messages.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace content {
 
 class BitmapData : public base::RefCountedThreadSafe<BitmapData> {
  public:
-  BitmapData(base::ProcessHandle process_handle,
-             size_t buffer_size)
-      : process_handle(process_handle),
-        buffer_size(buffer_size) {}
-  base::ProcessHandle process_handle;
+  BitmapData(size_t buffer_size) : buffer_size(buffer_size) {}

[ncarter (slow), 2016/04/14 17:37:36]

Needs 'explicit'

[Łukasz Anforowicz, 2016/04/14 19:34:48]

Done.

   std::unique_ptr<base::SharedMemory> memory;
   std::unique_ptr<uint8_t[]> pixels;
   size_t buffer_size;
 
  private:
   friend class base::RefCountedThreadSafe<BitmapData>;
   ~BitmapData() {}
   DISALLOW_COPY_AND_ASSIGN(BitmapData);
 };
 
@@ skipping 43 matching lines @@
                                          shared_memory_handle);
   if (*shared_memory_handle != base::SharedMemory::NULLHandle()) {
     base::AutoLock lock(lock_);
     owned_bitmaps_.insert(id);
   }
 }
 
 void HostSharedBitmapManagerClient::ChildAllocatedSharedBitmap(
     size_t buffer_size,
     const base::SharedMemoryHandle& handle,
-    base::ProcessHandle process_handle,
     const cc::SharedBitmapId& id) {
-  if (manager_->ChildAllocatedSharedBitmap(buffer_size, handle, process_handle,
-                                           id)) {
+  if (manager_->ChildAllocatedSharedBitmap(buffer_size, handle, id)) {
     base::AutoLock lock(lock_);
     owned_bitmaps_.insert(id);
   }
 }
 
 void HostSharedBitmapManagerClient::ChildDeletedSharedBitmap(
     const cc::SharedBitmapId& id) {
   manager_->ChildDeletedSharedBitmap(id);
   {
     base::AutoLock lock(lock_);
@@ skipping 10 matching lines @@
   return g_shared_memory_manager.Pointer();
 }
 
 std::unique_ptr<cc::SharedBitmap> HostSharedBitmapManager::AllocateSharedBitmap(
     const gfx::Size& size) {
   base::AutoLock lock(lock_);
   size_t bitmap_size;
   if (!cc::SharedBitmap::SizeInBytes(size, &bitmap_size))
     return std::unique_ptr<cc::SharedBitmap>();
 
-  scoped_refptr<BitmapData> data(
-      new BitmapData(base::GetCurrentProcessHandle(),
-                     bitmap_size));
+  scoped_refptr<BitmapData> data(new BitmapData(bitmap_size));
   // Bitmaps allocated in host don't need to be shared to other processes, so
   // allocate them with new instead.
   data->pixels = std::unique_ptr<uint8_t[]>(new uint8_t[bitmap_size]);
 
   cc::SharedBitmapId id = cc::SharedBitmap::GenerateId();
   handle_map_[id] = data;
   return base::WrapUnique(
       new HostSharedBitmap(data->pixels.get(), data, id, this));
 }
 
@@ skipping 48 matching lines @@
     pmd->CreateSharedGlobalAllocatorDump(guid);
     pmd->AddOwnershipEdge(dump->guid(), guid);
   }
 
   return true;
 }
 
 bool HostSharedBitmapManager::ChildAllocatedSharedBitmap(
     size_t buffer_size,
     const base::SharedMemoryHandle& handle,
-    base::ProcessHandle process_handle,
     const cc::SharedBitmapId& id) {
   base::AutoLock lock(lock_);
   if (handle_map_.find(id) != handle_map_.end())
     return false;
-  scoped_refptr<BitmapData> data(
-      new BitmapData(process_handle, buffer_size));
+  scoped_refptr<BitmapData> data(new BitmapData(buffer_size));
 
   handle_map_[id] = data;
   data->memory = base::WrapUnique(new base::SharedMemory(handle, false));
   data->memory->Map(data->buffer_size);
   data->memory->Close();
   return true;
 }
 
 void HostSharedBitmapManager::AllocateSharedBitmapForChild(
     base::ProcessHandle process_handle,
     size_t buffer_size,
     const cc::SharedBitmapId& id,
     base::SharedMemoryHandle* shared_memory_handle) {
   base::AutoLock lock(lock_);
   if (handle_map_.find(id) != handle_map_.end()) {
     *shared_memory_handle = base::SharedMemory::NULLHandle();
     return;
   }
   std::unique_ptr<base::SharedMemory> shared_memory(new base::SharedMemory);
   if (!shared_memory->CreateAndMapAnonymous(buffer_size)) {
     LOG(ERROR) << "Cannot create shared memory buffer";
     *shared_memory_handle = base::SharedMemory::NULLHandle();
     return;
   }
 
-  scoped_refptr<BitmapData> data(
-      new BitmapData(process_handle, buffer_size));
+  scoped_refptr<BitmapData> data(new BitmapData(buffer_size));
   data->memory = std::move(shared_memory);
 
   handle_map_[id] = data;
   if (!data->memory->ShareToProcess(process_handle, shared_memory_handle)) {
     LOG(ERROR) << "Cannot share shared memory buffer";
     *shared_memory_handle = base::SharedMemory::NULLHandle();
     return;
   }
  data->memory->Close();
 }
 
 void HostSharedBitmapManager::ChildDeletedSharedBitmap(
     const cc::SharedBitmapId& id) {
   base::AutoLock lock(lock_);
   handle_map_.erase(id);
 }
 
 size_t HostSharedBitmapManager::AllocatedBitmapCount() const {
   base::AutoLock lock(lock_);
   return handle_map_.size();
 }
 
 void HostSharedBitmapManager::FreeSharedMemoryFromMap(
     const cc::SharedBitmapId& id) {
   base::AutoLock lock(lock_);
   handle_map_.erase(id);
 }
 
 }  // namespace content