| Index: content/browser/renderer_host/compositor_impl_android.h
|
| diff --git a/content/browser/renderer_host/compositor_impl_android.h b/content/browser/renderer_host/compositor_impl_android.h
|
| index c5dfd27ef7408e64b74daea79b49b00a090b3728..54e75fb3ec8622a7610afd1cf2641fb65c227bd1 100644
|
| --- a/content/browser/renderer_host/compositor_impl_android.h
|
| +++ b/content/browser/renderer_host/compositor_impl_android.h
|
| @@ -23,7 +23,7 @@ namespace cc {
|
| class InputHandlerClient;
|
| class Layer;
|
| class LayerTreeHost;
|
| -class ScopedUIResource;
|
| +class UIResourceClient;
|
| }
|
|
|
| namespace content {
|
| @@ -61,15 +61,6 @@ class CONTENT_EXPORT CompositorImpl
|
| virtual cc::UIResourceId GenerateUIResource(
|
| const cc::UIResourceBitmap& bitmap) OVERRIDE;
|
| virtual void DeleteUIResource(cc::UIResourceId resource_id) OVERRIDE;
|
| - virtual GLuint GenerateTexture(gfx::JavaBitmap& bitmap) OVERRIDE;
|
| - virtual GLuint GenerateCompressedTexture(
|
| - gfx::Size& size, int data_size, void* data) OVERRIDE;
|
| - virtual void DeleteTexture(GLuint texture_id) OVERRIDE;
|
| - virtual bool CopyTextureToBitmap(GLuint texture_id,
|
| - gfx::JavaBitmap& bitmap) OVERRIDE;
|
| - virtual bool CopyTextureToBitmap(GLuint texture_id,
|
| - const gfx::Rect& sub_rect,
|
| - gfx::JavaBitmap& bitmap) OVERRIDE;
|
|
|
| // LayerTreeHostClient implementation.
|
| virtual void WillBeginMainFrame(int frame_id) OVERRIDE {}
|
| @@ -115,7 +106,7 @@ class CONTENT_EXPORT CompositorImpl
|
|
|
| scoped_refptr<cc::ContextProvider> null_offscreen_context_provider_;
|
|
|
| - typedef base::ScopedPtrHashMap<cc::UIResourceId, cc::ScopedUIResource>
|
| + typedef base::ScopedPtrHashMap<cc::UIResourceId, cc::UIResourceClient>
|
| UIResourceMap;
|
| UIResourceMap ui_resource_map_;
|
|
|
|
|