Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(260)

Unified Diff: ui/android/resources/resource_manager_impl.cc

Issue 2322943003: cc: Move UI Resource management out of LayerTreeHost. (Closed)
Patch Set: format Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/android/resources/resource_manager_impl.cc
diff --git a/ui/android/resources/resource_manager_impl.cc b/ui/android/resources/resource_manager_impl.cc
index 61c7bdad554d3f7999494da3fad752f8e48e2726..bb3358af4daf84c5ab1ffc2c0873b8d6ea1004e0 100644
--- a/ui/android/resources/resource_manager_impl.cc
+++ b/ui/android/resources/resource_manager_impl.cc
@@ -13,6 +13,7 @@
#include "base/android/jni_string.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 "ui/android/resources/ui_resource_provider.h"
#include "ui/android/window_android.h"
@@ -32,7 +33,7 @@ ResourceManagerImpl* ResourceManagerImpl::FromJavaObject(jobject 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(),
@@ -45,10 +46,10 @@ 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>
@@ -121,8 +122,8 @@ void ResourceManagerImpl::OnResourceReady(JNIEnv* env,
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(

Powered by Google App Engine
This is Rietveld 408576698