| Index: cc/resources/resource_provider.h
|
| diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
|
| index afabed7b8d8fcbc91c4278e70eab31e247cb7edb..0d2812075d9c13a0b74ee9da4b83577a15ffb547 100644
|
| --- a/cc/resources/resource_provider.h
|
| +++ b/cc/resources/resource_provider.h
|
| @@ -109,7 +109,6 @@ class CC_EXPORT ResourceProvider
|
| ResourceFormat best_render_buffer_format() const {
|
| return best_render_buffer_format_;
|
| }
|
| - ResourceFormat YuvResourceFormat(int bits) const;
|
| bool use_sync_query() const { return use_sync_query_; }
|
| gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager() {
|
| return gpu_memory_buffer_manager_;
|
| @@ -131,6 +130,7 @@ class CC_EXPORT ResourceProvider
|
| ResourceType default_resource_type() const { return default_resource_type_; }
|
| ResourceType GetResourceType(ResourceId id);
|
| GLenum GetResourceTextureTarget(ResourceId id);
|
| + ResourceFormat GetResourceFormat(ResourceId id);
|
| bool IsImmutable(ResourceId id);
|
| TextureHint GetTextureHint(ResourceId id);
|
|
|
| @@ -158,6 +158,12 @@ class CC_EXPORT ResourceProvider
|
| std::unique_ptr<SingleReleaseCallbackImpl> release_callback_impl,
|
| bool read_lock_fences_enabled);
|
|
|
| + ResourceId CreateResourceFromTextureMailbox(
|
| + const TextureMailbox& mailbox,
|
| + ResourceFormat format,
|
| + std::unique_ptr<SingleReleaseCallbackImpl> release_callback_impl,
|
| + bool read_lock_fences_enabled);
|
| +
|
| void DeleteResource(ResourceId id);
|
|
|
| // Update pixels from image, copying source_rect (in image) to dest_offset (in
|
| @@ -697,8 +703,6 @@ class CC_EXPORT ResourceProvider
|
| bool use_texture_format_bgra_;
|
| bool use_texture_usage_hint_;
|
| bool use_compressed_texture_etc1_;
|
| - ResourceFormat yuv_resource_format_;
|
| - ResourceFormat yuv_highbit_resource_format_;
|
| int max_texture_size_;
|
| ResourceFormat best_texture_format_;
|
| ResourceFormat best_render_buffer_format_;
|
|
|