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

Unified Diff: cc/resources/resource_provider.cc

Issue 690713002: cc: check valid thread and resource origin for the resource rasterized. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/resources/resource_provider.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/resource_provider.cc
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
index b638cb749126649edbb6fe13e4626d946efb3bbf..099d4533316d0e2c27df78d4909193ef8bdcb50f 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc
@@ -728,7 +728,7 @@ void ResourceProvider::DeleteResourceInternal(ResourceMap::iterator it,
resource->pixels = NULL;
}
if (resource->gpu_memory_buffer) {
- DCHECK(resource->origin != Resource::External);
dshwang 2014/10/29 15:34:20 It cannot be Resource::Delegated, which means the
+ DCHECK(resource->origin == Resource::Internal);
delete resource->gpu_memory_buffer;
resource->gpu_memory_buffer = NULL;
}
@@ -1039,17 +1039,15 @@ ResourceProvider::ScopedWriteLockGpuMemoryBuffer::
: resource_provider_(resource_provider),
resource_(resource_provider->LockForWrite(resource_id)),
gpu_memory_buffer_manager_(resource_provider->gpu_memory_buffer_manager_),
- gpu_memory_buffer_(nullptr),
size_(resource_->size),
format_(resource_->format) {
DCHECK_EQ(GLTexture, resource_->type);
- std::swap(gpu_memory_buffer_, resource_->gpu_memory_buffer);
}
ResourceProvider::ScopedWriteLockGpuMemoryBuffer::
~ScopedWriteLockGpuMemoryBuffer() {
resource_provider_->UnlockForWrite(resource_);
- if (!gpu_memory_buffer_)
+ if (!resource_->gpu_memory_buffer)
return;
if (!resource_->image_id) {
@@ -1057,13 +1055,12 @@ ResourceProvider::ScopedWriteLockGpuMemoryBuffer::
DCHECK(gl);
resource_->image_id =
- gl->CreateImageCHROMIUM(gpu_memory_buffer_->AsClientBuffer(),
+ gl->CreateImageCHROMIUM(resource_->gpu_memory_buffer->AsClientBuffer(),
size_.width(),
size_.height(),
GL_RGBA);
}
- std::swap(resource_->gpu_memory_buffer, gpu_memory_buffer_);
resource_->allocated = true;
resource_->dirty_image = true;
@@ -1075,14 +1072,14 @@ ResourceProvider::ScopedWriteLockGpuMemoryBuffer::
gfx::GpuMemoryBuffer*
ResourceProvider::ScopedWriteLockGpuMemoryBuffer::GetGpuMemoryBuffer() {
- if (!gpu_memory_buffer_) {
+ if (!resource_->gpu_memory_buffer) {
reveman 2014/10/29 16:02:24 This function might be used from a worker thread a
dshwang 2014/10/29 16:48:25 If this code breaks thread-safe, previous code is
reveman 2014/10/29 17:07:45 I don't think that's the case. Where is this "reso
dshwang 2014/10/29 17:32:52 For example, ResourceProvider::ScopedWriteLockGr::
reveman 2014/10/29 18:15:25 ::GetSkSurface() unlike ::GetGpuMemoryBuffer() can
scoped_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer =
gpu_memory_buffer_manager_->AllocateGpuMemoryBuffer(
size_, ToGpuMemoryBufferFormat(format_), gfx::GpuMemoryBuffer::MAP);
- gpu_memory_buffer_ = gpu_memory_buffer.release();
+ resource_->gpu_memory_buffer = gpu_memory_buffer.release();
}
- return gpu_memory_buffer_;
+ return resource_->gpu_memory_buffer;
}
ResourceProvider::ScopedWriteLockGr::ScopedWriteLockGr(
« no previous file with comments | « cc/resources/resource_provider.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698