Upstream ResourceManager

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 54c6469eb4709024be81459abd8224edd987e703..284d88066791b57b487fb92528b9e1325cb959b1 100644
--- a/content/browser/renderer_host/compositor_impl_android.h
+++ b/content/browser/renderer_host/compositor_impl_android.h
@@ -12,6 +12,7 @@
 #include "base/memory/weak_ptr.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "cc/trees/layer_tree_host_single_thread_client.h"
+#include "content/browser/android/resource_manager_impl.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"
@@ -34,6 +35,7 @@ class SurfaceIdAllocator;
 namespace content {
 class CompositorClient;
 class OnscreenDisplayClient;
+class ResourceManager;

[jdduke (slow), 2014/11/19 18:26:48]

Nit: We're already including the header, no need to forward declare (same for
UIResourceProvider).

[Jaekyun Seok (inactive), 2014/11/21 12:35:33]

Done.

 class UIResourceProvider;
 
 // -----------------------------------------------------------------------------
@@ -63,6 +65,7 @@ class CONTENT_EXPORT CompositorImpl
   virtual void SetHasTransparentBackground(bool flag) override;
   virtual void SetNeedsComposite() override;
   virtual UIResourceProvider& GetUIResourceProvider() override;
+  virtual ResourceManager& GetResourceManager() override;
 
   // LayerTreeHostClient implementation.
   virtual void WillBeginMainFrame(int frame_id) override {}
@@ -143,6 +146,7 @@ class CONTENT_EXPORT CompositorImpl
 
   scoped_ptr<cc::LayerTreeHost> host_;
   content::UIResourceProviderImpl ui_resource_provider_;
+  content::ResourceManagerImpl resource_manager_;
 
   scoped_ptr<OnscreenDisplayClient> display_client_;
   scoped_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;