Replace IDMap with std::unordered_map in ResourceManager

ui/android/resources/resource_manager_impl.cc

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 b97fb19251bbd0b169d4b3b373325a68624e9654..e3ea1e5f94b08eb0641ed04e3cb2f920f6db658d 100644
--- a/ui/android/resources/resource_manager_impl.cc
+++ b/ui/android/resources/resource_manager_impl.cc
@@ -66,12 +66,15 @@ ResourceManager::Resource* ResourceManagerImpl::GetResource(
   DCHECK_GE(res_type, ANDROID_RESOURCE_TYPE_FIRST);
   DCHECK_LE(res_type, ANDROID_RESOURCE_TYPE_LAST);
 
-  Resource* resource = resources_[res_type].Lookup(res_id);
+  Resource* resource = nullptr;
+  if (resources_[res_type].find(res_id) != resources_[res_type].end()) {
+    resource = resources_[res_type][res_id].get();
+  }
 
   if (!resource || res_type == ANDROID_RESOURCE_TYPE_DYNAMIC ||
       res_type == ANDROID_RESOURCE_TYPE_DYNAMIC_BITMAP) {
     RequestResourceFromJava(res_type, res_id);
-    resource = resources_[res_type].Lookup(res_id);
+    resource = resources_[res_type][res_id].get();
   }
 
   return resource;
@@ -98,11 +101,11 @@ ResourceManager::Resource* ResourceManagerImpl::GetStaticResourceWithTint(
   }
   ResourceMap* resource_map = tinted_resources_[tint_color].get();
 
-  Resource* tinted_resource = resource_map->Lookup(res_id);
-
   // If the resource is already cached, use it.
-  if (tinted_resource)
-    return tinted_resource;
+  if (resource_map->find(res_id) != resource_map->end())
+    return (*resource_map)[res_id].get();
+
+  Resource* tinted_resource = new Resource();

[aelias_OOO_until_Jul13, 2016/09/08 22:05:01]

Can you switch this local variable to a unique_ptr<> too?  We should never have
a raw pointer control lifetime, raw pointers should only be used for passive
readers.  Likewise for the two preexisting uses of "new" in this file.

[mdjones, 2016/09/09 16:47:23]

Done.

 
   tinted_resource = new Resource();
 
@@ -138,7 +141,7 @@ ResourceManager::Resource* ResourceManagerImpl::GetStaticResourceWithTint(
   tinted_resource->ui_resource = cc::ScopedUIResource::Create(host_,
       cc::UIResourceBitmap(tinted_bitmap));
 
-  resource_map->AddWithID(tinted_resource, res_id);
+  (*resource_map)[res_id] = base::WrapUnique<Resource>(tinted_resource);
 
   return tinted_resource;
 }
@@ -154,7 +157,7 @@ void ResourceManagerImpl::PreloadResource(AndroidResourceType res_type,
   DCHECK_LE(res_type, ANDROID_RESOURCE_TYPE_LAST);
 
   // Don't send out a query if the resource is already loaded.
-  if (resources_[res_type].Lookup(res_id))
+  if (resources_[res_type].find(res_id) != resources_[res_type].end())
     return;
 
   PreloadResourceFromJava(res_type, res_id);
@@ -179,11 +182,12 @@ void ResourceManagerImpl::OnResourceReady(JNIEnv* env,
                "resource_type", res_type,
                "resource_id", res_id);
 
-
-  Resource* resource = resources_[res_type].Lookup(res_id);
-  if (!resource) {
+  Resource* resource = nullptr;
+  if (resources_[res_type].find(res_id) == resources_[res_type].end()) {
     resource = new Resource();
-    resources_[res_type].AddWithID(resource, res_id);
+    resources_[res_type][res_id] = base::WrapUnique<Resource>(resource);
+  } else {
+    resource = resources_[res_type][res_id].get();
   }
 
   gfx::JavaBitmap jbitmap(bitmap.obj());
@@ -203,11 +207,16 @@ void ResourceManagerImpl::OnResourceReady(JNIEnv* env,
 
 CrushedSpriteResource* ResourceManagerImpl::GetCrushedSpriteResource(
     int bitmap_res_id, int metadata_res_id) {
-  CrushedSpriteResource* resource =
-      crushed_sprite_resources_.Lookup(bitmap_res_id);
+
+  CrushedSpriteResource* resource = nullptr;
+  if (crushed_sprite_resources_.find(bitmap_res_id)
+      != crushed_sprite_resources_.end()) {
+    resource = crushed_sprite_resources_[bitmap_res_id].get();
+  }
+
   if (!resource) {
     RequestCrushedSpriteResourceFromJava(bitmap_res_id, metadata_res_id, false);
-    resource = crushed_sprite_resources_.Lookup(bitmap_res_id);
+    resource = crushed_sprite_resources_[bitmap_res_id].get();
   } else if (resource->BitmapHasBeenEvictedFromMemory()) {
     RequestCrushedSpriteResourceFromJava(bitmap_res_id, metadata_res_id, true);
   }
@@ -242,11 +251,8 @@ void ResourceManagerImpl::OnCrushedSpriteResourceReady(
       gfx::Size(unscaled_sprite_width, unscaled_sprite_height),
       gfx::Size(scaled_sprite_width, scaled_sprite_height));
 
-  if (crushed_sprite_resources_.Lookup(bitmap_res_id)) {
-    crushed_sprite_resources_.Replace(bitmap_res_id, resource);
-  } else {
-    crushed_sprite_resources_.AddWithID(resource, bitmap_res_id);
-  }
+    crushed_sprite_resources_[bitmap_res_id] =

[David Trainor- moved to gerrit, 2016/09/09 06:11:32]

Indenting looks off

[mdjones, 2016/09/09 16:47:23]

Done.

+        base::WrapUnique<CrushedSpriteResource>(resource);
 }
 
 CrushedSpriteResource::SrcDstRects
@@ -283,12 +289,13 @@ void ResourceManagerImpl::OnCrushedSpriteResourceReloaded(
     const JavaRef<jobject>& jobj,
     jint bitmap_res_id,
     const JavaRef<jobject>& bitmap) {
-  CrushedSpriteResource* resource =
-      crushed_sprite_resources_.Lookup(bitmap_res_id);
-  if (!resource) {
+  if (crushed_sprite_resources_.find(bitmap_res_id)
+      == crushed_sprite_resources_.end()) {
     // Cannot reload a resource that has not been previously loaded.
     return;
   }
+  CrushedSpriteResource* resource =
+      crushed_sprite_resources_[bitmap_res_id].get();
   SkBitmap skbitmap =
       gfx::CreateSkBitmapFromJavaBitmap(gfx::JavaBitmap(bitmap.obj()));
   resource->SetBitmap(skbitmap);