cc: Move UI Resource management out of LayerTreeHost.

ui/android/resources/resource_manager_impl.cc

 // Copyright 2014 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 "ui/android/resources/resource_manager_impl.h"
 
 #include <stddef.h>
 
 #include <utility>
 #include <vector>
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/resources/scoped_ui_resource.h"
+#include "cc/resources/ui_resource_manager.h"
 #include "jni/ResourceManager_jni.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "ui/android/resources/ui_resource_provider.h"
 #include "ui/android/window_android.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/geometry/rect.h"
 
 using base::android::JavaArrayOfIntArrayToIntVector;
 using base::android::JavaRef;
 
 namespace ui {
 
 // static
 ResourceManagerImpl* ResourceManagerImpl::FromJavaObject(jobject jobj) {
   return reinterpret_cast<ResourceManagerImpl*>(
       Java_ResourceManager_getNativePtr(base::android::AttachCurrentThread(),
                                         jobj));
 }
 
 ResourceManagerImpl::ResourceManagerImpl(gfx::NativeWindow native_window)
-    : host_(nullptr) {
+    : ui_resource_manager_(nullptr) {
   JNIEnv* env = base::android::AttachCurrentThread();
   java_obj_.Reset(
       env, Java_ResourceManager_create(env, native_window->GetJavaObject(),
                                        reinterpret_cast<intptr_t>(this))
                .obj());
   DCHECK(!java_obj_.is_null());
 }
 
 ResourceManagerImpl::~ResourceManagerImpl() {
   Java_ResourceManager_destroy(base::android::AttachCurrentThread(), java_obj_);
 }
 
-void ResourceManagerImpl::Init(cc::LayerTreeHost* host) {
-  DCHECK(!host_);
-  DCHECK(host);
-  host_ = host;
+void ResourceManagerImpl::Init(cc::UIResourceManager* ui_resource_manager) {
+  DCHECK(!ui_resource_manager_);
+  DCHECK(ui_resource_manager);
+  ui_resource_manager_ = ui_resource_manager;
 }
 
 base::android::ScopedJavaLocalRef<jobject>
 ResourceManagerImpl::GetJavaObject() {
   return base::android::ScopedJavaLocalRef<jobject>(java_obj_);
 }
 
 ResourceManager::Resource* ResourceManagerImpl::GetResource(
     AndroidResourceType res_type,
     int res_id) {
@@ skipping 62 matching lines @@
   // Draw the resource and make it immutable.
   base_image->ui_resource->GetBitmap(base_image->ui_resource->id(), false)
       .DrawToCanvas(&canvas, &color_filter);
   tinted_bitmap.setImmutable();
 
   // Create a UI resource from the new bitmap.
   tinted_resource = new Resource();
   tinted_resource->size = gfx::Size(base_image->size);
   tinted_resource->padding = gfx::Rect(base_image->padding);
   tinted_resource->aperture = gfx::Rect(base_image->aperture);
-  tinted_resource->ui_resource = cc::ScopedUIResource::Create(host_,
-      cc::UIResourceBitmap(tinted_bitmap));
+  tinted_resource->ui_resource = cc::ScopedUIResource::Create(
+      ui_resource_manager_, cc::UIResourceBitmap(tinted_bitmap));
 
   resource_map->AddWithID(tinted_resource, res_id);
 
   return tinted_resource;
 }
 
 void ResourceManagerImpl::ClearTintedResourceCache(JNIEnv* env,
     const JavaRef<jobject>& jobj) {
   tinted_resources_.clear();
 }
@@ skipping 39 matching lines @@
   resource->size = jbitmap.size();
   resource->padding.SetRect(padding_left, padding_top,
                             padding_right - padding_left,
                             padding_bottom - padding_top);
   resource->aperture.SetRect(aperture_left, aperture_top,
                              aperture_right - aperture_left,
                              aperture_bottom - aperture_top);
 
   SkBitmap skbitmap = gfx::CreateSkBitmapFromJavaBitmap(jbitmap);
   skbitmap.setImmutable();
-  resource->ui_resource =
-      cc::ScopedUIResource::Create(host_, cc::UIResourceBitmap(skbitmap));
+  resource->ui_resource = cc::ScopedUIResource::Create(
+      ui_resource_manager_, cc::UIResourceBitmap(skbitmap));
 }
 
 CrushedSpriteResource* ResourceManagerImpl::GetCrushedSpriteResource(
     int bitmap_res_id, int metadata_res_id) {
   CrushedSpriteResource* resource =
       crushed_sprite_resources_.Lookup(bitmap_res_id);
   if (!resource) {
     RequestCrushedSpriteResourceFromJava(bitmap_res_id, metadata_res_id, false);
     resource = crushed_sprite_resources_.Lookup(bitmap_res_id);
   } else if (resource->BitmapHasBeenEvictedFromMemory()) {
@@ skipping 110 matching lines @@
   TRACE_EVENT2("ui",
                "ResourceManagerImpl::RequestCrushedSpriteResourceFromJava",
                "bitmap_res_id", bitmap_res_id,
                "metadata_res_id", metadata_res_id);
   Java_ResourceManager_crushedSpriteResourceRequested(
       base::android::AttachCurrentThread(), java_obj_, bitmap_res_id,
       metadata_res_id, reloading);
 }
 
 }  // namespace ui