Upstream ResourceManager

content/browser/renderer_host/compositor_impl_android.cc

Index: content/browser/renderer_host/compositor_impl_android.cc
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index 9493928205145001266552f475725575da0d1229..dcb00e5c2dffa0d29afbb870912b5aa8af48a89b 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -169,9 +169,12 @@ CompositorImpl::CompositorImpl(CompositorClient* client,
   DCHECK(root_window);
   ImageTransportFactoryAndroid::AddObserver(this);
   root_window->AttachCompositor(this);
+  resource_manager_.reset(
+      new content::ResourceManagerImpl(&ui_resource_provider_));
 }
 
 CompositorImpl::~CompositorImpl() {
+  resource_manager_.reset(NULL);

[David Trainor- moved to gerrit, 2014/11/18 18:53:53]

nullptr?

[Jaekyun Seok (inactive), 2014/11/18 23:34:02]

Done.

   root_window_->DetachCompositor();
   ImageTransportFactoryAndroid::RemoveObserver(this);
   // Clean-up any surface references.
@@ -297,6 +300,10 @@ UIResourceProvider& CompositorImpl::GetUIResourceProvider() {
   return ui_resource_provider_;
 }
 
+ResourceManager* CompositorImpl::GetResourceManager() {
+  return resource_manager_.get();
+}
+
 ui::SystemUIResourceManager& CompositorImpl::GetSystemUIResourceManager() {
   return ui_resource_provider_.GetSystemUIResourceManager();
 }