| 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 845e830aad4413470de71a4f7984d101edb0c356..58e44c894491ea8ab5c764c16746acffde2a62f1 100644
|
| --- a/content/browser/renderer_host/compositor_impl_android.h
|
| +++ b/content/browser/renderer_host/compositor_impl_android.h
|
| @@ -7,8 +7,10 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| +#include "base/containers/scoped_ptr_hash_map.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| +#include "cc/resources/ui_resource_client.h"
|
| #include "cc/trees/layer_tree_host_client.h"
|
| #include "content/browser/renderer_host/image_transport_factory_android.h"
|
| #include "content/common/content_export.h"
|
| @@ -21,6 +23,7 @@ namespace cc {
|
| class InputHandlerClient;
|
| class Layer;
|
| class LayerTreeHost;
|
| +class ScopedUIResource;
|
| }
|
|
|
| namespace content {
|
| @@ -60,6 +63,9 @@ class CONTENT_EXPORT CompositorImpl
|
| void *pixels, const gfx::Rect& rect) OVERRIDE;
|
| virtual void SetNeedsRedraw() OVERRIDE;
|
| virtual void Composite() OVERRIDE;
|
| + virtual cc::UIResourceId GenerateUIResource(
|
| + const cc::UIResourceBitmap& bitmap) OVERRIDE;
|
| + virtual void DeleteUIResource(cc::UIResourceId resource_id) OVERRIDE;
|
| virtual WebKit::WebGLId GenerateTexture(gfx::JavaBitmap& bitmap) OVERRIDE;
|
| virtual WebKit::WebGLId GenerateCompressedTexture(
|
| gfx::Size& size, int data_size, void* data) OVERRIDE;
|
| @@ -117,6 +123,10 @@ class CONTENT_EXPORT CompositorImpl
|
|
|
| scoped_refptr<cc::ContextProvider> null_offscreen_context_provider_;
|
|
|
| + typedef base::ScopedPtrHashMap<cc::UIResourceId, cc::ScopedUIResource>
|
| + UIResourceMap;
|
| + UIResourceMap ui_resource_map_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(CompositorImpl);
|
| };
|
|
|
|
|