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

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

Issue 1139063002: cc: Partial tile update for one-copy raster. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: monocle: bademacs Created 5 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 <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 9
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
(...skipping 1086 matching lines...) Expand 10 before | Expand all | Expand 10 after
1097 if (!gpu_memory_buffer_) { 1097 if (!gpu_memory_buffer_) {
1098 scoped_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer = 1098 scoped_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer =
1099 gpu_memory_buffer_manager_->AllocateGpuMemoryBuffer( 1099 gpu_memory_buffer_manager_->AllocateGpuMemoryBuffer(
1100 size_, ToGpuMemoryBufferFormat(format_), gfx::GpuMemoryBuffer::MAP); 1100 size_, ToGpuMemoryBufferFormat(format_), gfx::GpuMemoryBuffer::MAP);
1101 gpu_memory_buffer_ = gpu_memory_buffer.release(); 1101 gpu_memory_buffer_ = gpu_memory_buffer.release();
1102 } 1102 }
1103 1103
1104 return gpu_memory_buffer_; 1104 return gpu_memory_buffer_;
1105 } 1105 }
1106 1106
1107 ResourceProvider::ScopedReadLockGpuMemoryBuffer::ScopedReadLockGpuMemoryBuffer(
1108 ResourceProvider* resource_provider,
1109 ResourceProvider::ResourceId resource_id)
1110 : resource_provider_(resource_provider),
1111 resource_id_(resource_id),
1112 gpu_memory_buffer_(nullptr) {
1113 const Resource* resource = resource_provider->LockForRead(resource_id);
1114 DCHECK_EQ(RESOURCE_TYPE_GL_TEXTURE, resource->type);
1115 DCHECK(resource->allocated);
1116 DCHECK(resource->image_id);
1117 DCHECK(resource->gpu_memory_buffer);
1118 gpu_memory_buffer_ = resource->gpu_memory_buffer;
1119 }
1120
1121 ResourceProvider::ScopedReadLockGpuMemoryBuffer::
1122 ~ScopedReadLockGpuMemoryBuffer() {
1123 DCHECK(thread_checker_.CalledOnValidThread());
1124 resource_provider_->UnlockForRead(resource_id_);
1125 }
1126
1127 gfx::GpuMemoryBuffer*
1128 ResourceProvider::ScopedReadLockGpuMemoryBuffer::GetGpuMemoryBuffer() {
1129 return gpu_memory_buffer_;
1130 }
1131
1107 ResourceProvider::ScopedWriteLockGr::ScopedWriteLockGr( 1132 ResourceProvider::ScopedWriteLockGr::ScopedWriteLockGr(
1108 ResourceProvider* resource_provider, 1133 ResourceProvider* resource_provider,
1109 ResourceProvider::ResourceId resource_id) 1134 ResourceProvider::ResourceId resource_id)
1110 : resource_provider_(resource_provider), 1135 : resource_provider_(resource_provider),
1111 resource_(resource_provider->LockForWrite(resource_id)) { 1136 resource_(resource_provider->LockForWrite(resource_id)) {
1112 DCHECK(thread_checker_.CalledOnValidThread()); 1137 DCHECK(thread_checker_.CalledOnValidThread());
1113 resource_provider_->LazyAllocate(resource_); 1138 resource_provider_->LazyAllocate(resource_);
1114 } 1139 }
1115 1140
1116 ResourceProvider::ScopedWriteLockGr::~ScopedWriteLockGr() { 1141 ResourceProvider::ScopedWriteLockGr::~ScopedWriteLockGr() {
(...skipping 939 matching lines...) Expand 10 before | Expand all | Expand 10 after
2056 } 2081 }
2057 2082
2058 class GrContext* ResourceProvider::GrContext(bool worker_context) const { 2083 class GrContext* ResourceProvider::GrContext(bool worker_context) const {
2059 ContextProvider* context_provider = 2084 ContextProvider* context_provider =
2060 worker_context ? output_surface_->worker_context_provider() 2085 worker_context ? output_surface_->worker_context_provider()
2061 : output_surface_->context_provider(); 2086 : output_surface_->context_provider();
2062 return context_provider ? context_provider->GrContext() : NULL; 2087 return context_provider ? context_provider->GrContext() : NULL;
2063 } 2088 }
2064 2089
2065 } // namespace cc 2090 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698