Upstream ResourceManager

content/browser/renderer_host/compositor_impl_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/compositor_impl_android.h"
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
 
 #include "base/android/jni_android.h"
@@ skipping 151 matching lines @@
       needs_composite_(false),
       needs_animate_(false),
       will_composite_immediately_(false),
       composite_on_vsync_trigger_(DO_NOT_COMPOSITE),
       pending_swapbuffers_(0U),
       weak_factory_(this) {
   DCHECK(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.
   SetSurface(NULL);
 }
 
 void CompositorImpl::PostComposite(CompositingTrigger trigger) {
   DCHECK(needs_composite_);
   DCHECK(trigger == COMPOSITE_IMMEDIATELY || trigger == COMPOSITE_EVENTUALLY);
 
@@ skipping 105 matching lines @@
     pending_swapbuffers_++;
 
   // Need to track vsync to avoid compositing more than once per frame.
   root_window_->RequestVSyncUpdate();
 }
 
 UIResourceProvider& CompositorImpl::GetUIResourceProvider() {
   return ui_resource_provider_;
 }
 
+ResourceManager* CompositorImpl::GetResourceManager() {
+  return resource_manager_.get();
+}
+
 ui::SystemUIResourceManager& CompositorImpl::GetSystemUIResourceManager() {
   return ui_resource_provider_.GetSystemUIResourceManager();
 }
 
 void CompositorImpl::SetRootLayer(scoped_refptr<cc::Layer> root_layer) {
   if (subroot_layer_.get()) {
     subroot_layer_->RemoveFromParent();
     subroot_layer_ = NULL;
   }
   if (root_layer.get()) {
@@ skipping 321 matching lines @@
 }
 
 void CompositorImpl::SetNeedsAnimate() {
   if (!host_)
     return;
 
   host_->SetNeedsAnimate();
 }
 
 }  // namespace content