android: content::UIResourceProvider and content::UIResourceClientAndroid

content/browser/renderer_host/compositor_impl_android.h

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 e82ca779d8285dd67d0ef3330adf7793deb58556..a7455525ea6a24a86219821ba0bc34021f6de349 100644
--- a/content/browser/renderer_host/compositor_impl_android.h
+++ b/content/browser/renderer_host/compositor_impl_android.h
@@ -13,6 +13,7 @@
 #include "cc/resources/ui_resource_client.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "cc/trees/layer_tree_host_single_thread_client.h"
+#include "content/browser/android/ui_resource_provider_impl.h"
 #include "content/browser/renderer_host/image_transport_factory_android.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/android/compositor.h"
@@ -31,6 +32,7 @@ class LayerTreeHost;
 namespace content {
 class CompositorClient;
 class GraphicsContext;
+class UIResourceProvider;
 
 // -----------------------------------------------------------------------------
 // Browser-side compositor that manages a tree of content and UI layers.
@@ -64,13 +66,7 @@ class CONTENT_EXPORT CompositorImpl
   virtual void SetWindowBounds(const gfx::Size& size) OVERRIDE;
   virtual void SetHasTransparentBackground(bool flag) OVERRIDE;
   virtual void SetNeedsComposite() OVERRIDE;
-  virtual cc::UIResourceId GenerateUIResource(const SkBitmap& bitmap,
-                                              bool is_transient) OVERRIDE;
-  virtual cc::UIResourceId GenerateCompressedUIResource(const gfx::Size& size,
-                                                        void* pixels,
-                                                        bool is_transient)
-      OVERRIDE;
-  virtual void DeleteUIResource(cc::UIResourceId resource_id) OVERRIDE;
+  virtual UIResourceProvider& GetUIResourceProvider() OVERRIDE;
 
   // LayerTreeHostClient implementation.
   virtual void WillBeginMainFrame(int frame_id) OVERRIDE {}
@@ -138,6 +134,7 @@ class CONTENT_EXPORT CompositorImpl
 
   scoped_refptr<cc::Layer> root_layer_;
   scoped_ptr<cc::LayerTreeHost> host_;
+  content::UIResourceProviderImpl ui_resource_provider_;
 
   gfx::Size size_;
   bool has_transparent_background_;
@@ -148,10 +145,6 @@ class CONTENT_EXPORT CompositorImpl
 
   CompositorClient* client_;
 
-  typedef base::ScopedPtrHashMap<cc::UIResourceId, cc::UIResourceClient>
-      UIResourceMap;
-  UIResourceMap ui_resource_map_;
-
   gfx::NativeWindow root_window_;
 
   // Used locally to track whether a call to LTH::Composite() did result in