Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(153)

Side by Side Diff: cc/resources/resource_provider.cc

Issue 1984873002: Add logic to ResourceProvider to correctly lock GpuMemoryBuffer Resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/resources/resource_provider.h" 5 #include "cc/resources/resource_provider.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after
1035 resource_(resource_provider->LockForWrite(resource_id)) { 1035 resource_(resource_provider->LockForWrite(resource_id)) {
1036 ResourceProvider::PopulateSkBitmapWithResource(&sk_bitmap_, resource_); 1036 ResourceProvider::PopulateSkBitmapWithResource(&sk_bitmap_, resource_);
1037 DCHECK(valid()); 1037 DCHECK(valid());
1038 } 1038 }
1039 1039
1040 ResourceProvider::ScopedWriteLockSoftware::~ScopedWriteLockSoftware() { 1040 ResourceProvider::ScopedWriteLockSoftware::~ScopedWriteLockSoftware() {
1041 DCHECK(thread_checker_.CalledOnValidThread()); 1041 DCHECK(thread_checker_.CalledOnValidThread());
1042 resource_provider_->UnlockForWrite(resource_); 1042 resource_provider_->UnlockForWrite(resource_);
1043 } 1043 }
1044 1044
1045 ResourceProvider::ScopedReadLockGpuMemoryBuffer::ScopedReadLockGpuMemoryBuffer(
1046 ResourceProvider* resource_provider,
1047 ResourceId resource_id)
1048 : resource_provider_(resource_provider),
1049 resource_id_(resource_id),
1050 resource_(resource_provider->LockForRead(resource_id)) {
1051 DCHECK(IsGpuResourceType(resource_->type));
ccameron 2016/05/17 03:36:38 This will need to create the GpuMemoryBuffer from
erikchen 2016/05/17 22:13:20 N/A
1052 }
1053
1054 ResourceProvider::ScopedReadLockGpuMemoryBuffer::
1055 ~ScopedReadLockGpuMemoryBuffer() {
1056 resource_provider_->UnlockForRead(resource_id_);
1057 }
1058
1059 bool ResourceProvider::ScopedReadLockGpuMemoryBuffer::
1060 IsInUseByMacOSWindowServer() const {
1061 if (!resource_->gpu_memory_buffer)
1062 return false;
1063 return resource_->gpu_memory_buffer->IsInUseByMacOSWindowServer();
1064 }
1065
1045 ResourceProvider::ScopedWriteLockGpuMemoryBuffer:: 1066 ResourceProvider::ScopedWriteLockGpuMemoryBuffer::
1046 ScopedWriteLockGpuMemoryBuffer(ResourceProvider* resource_provider, 1067 ScopedWriteLockGpuMemoryBuffer(ResourceProvider* resource_provider,
1047 ResourceId resource_id) 1068 ResourceId resource_id)
1048 : resource_provider_(resource_provider), 1069 : resource_provider_(resource_provider),
1049 resource_(resource_provider->LockForWrite(resource_id)) { 1070 resource_(resource_provider->LockForWrite(resource_id)) {
1050 DCHECK(IsGpuResourceType(resource_->type)); 1071 DCHECK(IsGpuResourceType(resource_->type));
1051 gpu_memory_buffer_ = std::move(resource_->gpu_memory_buffer); 1072 gpu_memory_buffer_ = std::move(resource_->gpu_memory_buffer);
1052 resource_->gpu_memory_buffer = nullptr; 1073 resource_->gpu_memory_buffer = nullptr;
1053 } 1074 }
1054 1075
(...skipping 913 matching lines...) Expand 10 before | Expand all | Expand 10 after
1968 1989
1969 const int kImportance = 2; 1990 const int kImportance = 2;
1970 pmd->CreateSharedGlobalAllocatorDump(guid); 1991 pmd->CreateSharedGlobalAllocatorDump(guid);
1971 pmd->AddOwnershipEdge(dump->guid(), guid, kImportance); 1992 pmd->AddOwnershipEdge(dump->guid(), guid, kImportance);
1972 } 1993 }
1973 1994
1974 return true; 1995 return true;
1975 } 1996 }
1976 1997
1977 } // namespace cc 1998 } // namespace cc
OLDNEW
« cc/resources/resource_provider.h ('K') | « cc/resources/resource_provider.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698