Index: ui/android/resources/resource_manager_impl.h |
diff --git a/ui/android/resources/resource_manager_impl.h b/ui/android/resources/resource_manager_impl.h |
index 6e74ca58e45af8365ae641bc5aff853c0f85ec5c..4d12fa6bac9e796680e38db524e99ef49f411368 100644 |
--- a/ui/android/resources/resource_manager_impl.h |
+++ b/ui/android/resources/resource_manager_impl.h |
@@ -25,6 +25,8 @@ class UI_ANDROID_EXPORT ResourceManagerImpl : public ResourceManager { |
base::android::ScopedJavaLocalRef<jobject> GetJavaObject() override; |
Resource* GetResource(AndroidResourceType res_type, int res_id) override; |
void PreloadResource(AndroidResourceType res_type, int res_id) override; |
+ CrushedSpriteResource* GetCrushedSpriteResource( |
+ int bitmap_res_id, int metadata_res_id) override; |
// Called from Java |
// ---------------------------------------------------------- |
@@ -41,6 +43,17 @@ class UI_ANDROID_EXPORT ResourceManagerImpl : public ResourceManager { |
jint aperture_top, |
jint aperture_right, |
jint aperture_bottom); |
+ void OnCrushedSpriteResourceReady(JNIEnv* env, |
+ jobject jobj, |
+ jint bitmap_res_id, |
+ jobject bitmap, |
+ jobjectArray frame_rects, |
+ jint sprite_width, |
+ jint sprite_height); |
+ void OnCrushedSpriteResourceReloaded(JNIEnv* env, |
+ jobject jobj, |
+ jint bitmap_res_id, |
+ jobject bitmap); |
static bool RegisterResourceManager(JNIEnv* env); |
@@ -52,11 +65,17 @@ class UI_ANDROID_EXPORT ResourceManagerImpl : public ResourceManager { |
int res_id); |
virtual void RequestResourceFromJava(AndroidResourceType res_type, |
int res_id); |
+ virtual void RequestCrushedSpriteResourceFromJava(int bitmap_res_id, |
+ int metadata_res_id, |
+ bool reloading); |
typedef IDMap<Resource, IDMapOwnPointer> ResourceMap; |
+ typedef IDMap<CrushedSpriteResource, IDMapOwnPointer> |
+ CrushedSpriteResourceMap; |
cc::LayerTreeHost* host_; |
ResourceMap resources_[ANDROID_RESOURCE_TYPE_COUNT]; |
+ CrushedSpriteResourceMap crushed_sprite_resources_; |
base::android::ScopedJavaGlobalRef<jobject> java_obj_; |