| Index: cc/resources/scoped_resource.cc
|
| diff --git a/cc/resources/scoped_resource.cc b/cc/resources/scoped_resource.cc
|
| index 525fb735db5a57a1a49dbcc1d7d082fd3a049dfe..5fcaaca7acc96f8340501eece6124db82277a79b 100644
|
| --- a/cc/resources/scoped_resource.cc
|
| +++ b/cc/resources/scoped_resource.cc
|
| @@ -16,14 +16,14 @@ ScopedResource::~ScopedResource() {
|
| }
|
|
|
| bool ScopedResource::Allocate(gfx::Size size,
|
| - GLenum format,
|
| - ResourceProvider::TextureUsageHint hint) {
|
| + ResourceProvider::TextureUsageHint hint,
|
| + ResourceFormat format) {
|
| DCHECK(!id());
|
| DCHECK(!size.IsEmpty());
|
|
|
| set_dimensions(size, format);
|
| set_id(resource_provider_->CreateResource(
|
| - size, format, GL_CLAMP_TO_EDGE, hint));
|
| + size, GL_CLAMP_TO_EDGE, hint, format));
|
|
|
| #ifndef NDEBUG
|
| allocate_thread_id_ = base::PlatformThread::CurrentId();
|
|
|