| Index: cc/resources/resource_provider.cc
|
| diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
|
| index 9d06c6d7449e910f454999d83b488e20787b1a22..37e9a9b3cade524a6a3f791c5e65db0457be2315 100644
|
| --- a/cc/resources/resource_provider.cc
|
| +++ b/cc/resources/resource_provider.cc
|
| @@ -670,6 +670,7 @@ ResourceId ResourceProvider::CreateBitmap(const gfx::Size& size,
|
|
|
| ResourceId ResourceProvider::CreateResourceFromTextureMailbox(
|
| const TextureMailbox& mailbox,
|
| + gfx::BufferFormat buffer_format,
|
| std::unique_ptr<SingleReleaseCallbackImpl> release_callback_impl,
|
| bool read_lock_fences_enabled) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| @@ -693,6 +694,7 @@ ResourceId ResourceProvider::CreateResourceFromTextureMailbox(
|
| id, Resource(pixels, shared_bitmap, mailbox.size_in_pixels(),
|
| Resource::EXTERNAL, GL_LINEAR));
|
| }
|
| + resource->buffer_format = buffer_format;
|
| resource->allocated = true;
|
| resource->set_mailbox(mailbox);
|
| resource->color_space = mailbox.color_space();
|
| @@ -716,8 +718,9 @@ ResourceId ResourceProvider::CreateResourceFromTextureMailbox(
|
| ResourceId ResourceProvider::CreateResourceFromTextureMailbox(
|
| const TextureMailbox& mailbox,
|
| std::unique_ptr<SingleReleaseCallbackImpl> release_callback_impl) {
|
| - return CreateResourceFromTextureMailbox(
|
| - mailbox, std::move(release_callback_impl), false);
|
| + return CreateResourceFromTextureMailbox(mailbox, gfx::BufferFormat::RGBA_8888,
|
| + std::move(release_callback_impl),
|
| + false);
|
| }
|
|
|
| void ResourceProvider::DeleteResource(ResourceId id) {
|
|
|