Reland of Add logic to ResourceProvider to correctly lock GpuMemoryBuffer Resources.

cc/resources/resource_provider.cc

 // Copyright 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 "cc/resources/resource_provider.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 1110 matching lines @@
 
 gfx::GpuMemoryBuffer*
 ResourceProvider::ScopedReadLockGpuMemoryBuffer::GetGpuMemoryBuffer() const {
   return resource_->gpu_memory_buffer.get();
 }
 
 unsigned ResourceProvider::ScopedReadLockGpuMemoryBuffer::GetTextureId() const {
   return resource_->gl_id;
 }
 
+ResourceId ResourceProvider::ScopedReadLockGpuMemoryBuffer::GetResourceId()
+    const {
+  return resource_id_;
+}
+
 ResourceProvider::ScopedWriteLockGr::ScopedWriteLockGr(
     ResourceProvider* resource_provider,
     ResourceId resource_id)
     : resource_provider_(resource_provider),
       resource_(resource_provider->LockForWrite(resource_id)),
       set_sync_token_(false) {
   DCHECK(thread_checker_.CalledOnValidThread());
   resource_provider_->LazyAllocate(resource_);
   if (resource_->image_id && resource_->dirty_image)
     resource_provider_->BindImageForSampling(resource_);
@@ skipping 870 matching lines @@
 
     const int kImportance = 2;
     pmd->CreateSharedGlobalAllocatorDump(guid);
     pmd->AddOwnershipEdge(dump->guid(), guid, kImportance);
   }
 
   return true;
 }
 
 }  // namespace cc