| Index: cc/resources/scoped_resource.cc
|
| diff --git a/cc/resources/scoped_resource.cc b/cc/resources/scoped_resource.cc
|
| index 532ca120baa0073c84124b288218d8a92c8230ba..b29b7c43c31de7b5fe1c1409fe997f2e269d1038 100644
|
| --- a/cc/resources/scoped_resource.cc
|
| +++ b/cc/resources/scoped_resource.cc
|
| @@ -17,27 +17,31 @@ ScopedResource::~ScopedResource() {
|
|
|
| void ScopedResource::Allocate(const gfx::Size& size,
|
| ResourceProvider::TextureHint hint,
|
| - ResourceFormat format) {
|
| + ResourceFormat format,
|
| + const gfx::ColorSpace& color_space) {
|
| DCHECK(!id());
|
| DCHECK(!size.IsEmpty());
|
|
|
| set_dimensions(size, format);
|
| - set_id(resource_provider_->CreateResource(size, hint, format));
|
| + set_id(resource_provider_->CreateResource(size, hint, format, color_space));
|
|
|
| #if DCHECK_IS_ON()
|
| allocate_thread_id_ = base::PlatformThread::CurrentId();
|
| #endif
|
| }
|
|
|
| -void ScopedResource::AllocateWithGpuMemoryBuffer(const gfx::Size& size,
|
| - ResourceFormat format,
|
| - gfx::BufferUsage usage) {
|
| +void ScopedResource::AllocateWithGpuMemoryBuffer(
|
| + const gfx::Size& size,
|
| + ResourceFormat format,
|
| + gfx::BufferUsage usage,
|
| + const gfx::ColorSpace& color_space) {
|
| DCHECK(!id());
|
| DCHECK(!size.IsEmpty());
|
|
|
| set_dimensions(size, format);
|
| set_id(resource_provider_->CreateGpuMemoryBufferResource(
|
| - size, ResourceProvider::TEXTURE_HINT_IMMUTABLE, format, usage));
|
| + size, ResourceProvider::TEXTURE_HINT_IMMUTABLE, format, usage,
|
| + color_space));
|
|
|
| #if DCHECK_IS_ON()
|
| allocate_thread_id_ = base::PlatformThread::CurrentId();
|
|
|