Revert "Bug fix: TranferBufferManager's SharedMemory memory usage reporting was wrong"

gpu/command_buffer/service/transfer_buffer_manager.cc

 // Copyright (c) 2012 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 "gpu/command_buffer/service/transfer_buffer_manager.h"
 
 #include <stdint.h>
 
 #include <limits>
 #include <memory>
@@ skipping 22 matching lines @@
   if (memory_tracker_) {
     base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
         this, "gpu::TransferBufferManager",
         base::ThreadTaskRunnerHandle::Get());
   }
 }
 
 TransferBufferManager::~TransferBufferManager() {
   while (!registered_buffers_.empty()) {
     BufferMap::iterator it = registered_buffers_.begin();
-    if (it->second->backing()->is_shared()) {
-      DCHECK(shared_memory_bytes_allocated_ >= it->second->size());
-      shared_memory_bytes_allocated_ -= it->second->size();
-    }
+    DCHECK(shared_memory_bytes_allocated_ >= it->second->size());
+    shared_memory_bytes_allocated_ -= it->second->size();
     registered_buffers_.erase(it);
   }
   DCHECK(!shared_memory_bytes_allocated_);
 
   base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider(
       this);
 }
 
 bool TransferBufferManager::RegisterTransferBuffer(
     int32_t id,
     std::unique_ptr<BufferBacking> buffer_backing) {
   if (id <= 0) {
     DVLOG(0) << "Cannot register transfer buffer with non-positive ID.";
     return false;
   }
 
   // Fail if the ID is in use.
   if (registered_buffers_.find(id) != registered_buffers_.end()) {
     DVLOG(0) << "Buffer ID already in use.";
     return false;
   }
 
   // Register the shared memory with the ID.
   scoped_refptr<Buffer> buffer(new gpu::Buffer(std::move(buffer_backing)));
 
   // Check buffer alignment is sane.
   DCHECK(!(reinterpret_cast<uintptr_t>(buffer->memory()) &
            (kCommandBufferEntrySize - 1)));
 
-  if (buffer->backing()->is_shared())
-    shared_memory_bytes_allocated_ += buffer->size();
+  shared_memory_bytes_allocated_ += buffer->size();
+
   registered_buffers_[id] = buffer;
 
   return true;
 }
 
 void TransferBufferManager::DestroyTransferBuffer(int32_t id) {
   BufferMap::iterator it = registered_buffers_.find(id);
   if (it == registered_buffers_.end()) {
     DVLOG(0) << "Transfer buffer ID was not registered.";
     return;
   }
 
-  if (it->second->backing()->is_shared()) {
-    DCHECK(shared_memory_bytes_allocated_ >= it->second->size());
-    shared_memory_bytes_allocated_ -= it->second->size();
-  }
+  DCHECK(shared_memory_bytes_allocated_ >= it->second->size());
+  shared_memory_bytes_allocated_ -= it->second->size();
+
   registered_buffers_.erase(it);
 }
 
 scoped_refptr<Buffer> TransferBufferManager::GetTransferBuffer(int32_t id) {
   if (id == 0)
     return NULL;
 
   BufferMap::iterator it = registered_buffers_.find(id);
   if (it == registered_buffers_.end())
     return NULL;
@@ skipping 21 matching lines @@
 
   for (const auto& buffer_entry : registered_buffers_) {
     int32_t buffer_id = buffer_entry.first;
     const Buffer* buffer = buffer_entry.second.get();
     std::string dump_name =
         base::StringPrintf("gpu/transfer_memory/client_%d/buffer_%d",
                            memory_tracker_->ClientId(), buffer_id);
     MemoryAllocatorDump* dump = pmd->CreateAllocatorDump(dump_name);
     dump->AddScalar(MemoryAllocatorDump::kNameSize,
                     MemoryAllocatorDump::kUnitsBytes, buffer->size());
-    if (buffer->backing()->is_shared()) {
-      auto guid = GetBufferGUIDForTracing(memory_tracker_->ClientTracingId(),
-                                          buffer_id);
-      pmd->CreateSharedGlobalAllocatorDump(guid);
-      pmd->AddOwnershipEdge(dump->guid(), guid);
-    }
+    auto guid =
+        GetBufferGUIDForTracing(memory_tracker_->ClientTracingId(), buffer_id);
+    pmd->CreateSharedGlobalAllocatorDump(guid);
+    pmd->AddOwnershipEdge(dump->guid(), guid);
   }
 
   return true;
 }
 
 }  // namespace gpu