Chromium Code Reviews| 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..5e7198f6ff1860e29a5813889527930958d03634 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,7 @@ 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; |
| + virtual void SetNeedsCommit() OVERRIDE; |
|
powei
2014/01/28 19:46:44
Debug purpose only. Will be removed.
|
| // LayerTreeHostClient implementation. |
| virtual void WillBeginMainFrame(int frame_id) OVERRIDE {} |
| @@ -115,7 +107,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_; |