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

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

Issue 2325623003: Replace IDMap with std::unordered_map in ResourceManager (Closed)
Patch Set: address comments 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.h
diff --git a/ui/android/resources/resource_manager_impl.h b/ui/android/resources/resource_manager_impl.h
index 31d26f5f8f945b94305bb817d8ab30de1e1b5d4e..889e7b9dbc0d500966f34e4262151ec69e43b4d8 100644
--- a/ui/android/resources/resource_manager_impl.h
+++ b/ui/android/resources/resource_manager_impl.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/id_map.h"
#include "base/macros.h"
+#include "third_party/skia/include/core/SkColor.h"
#include "ui/android/resources/resource_manager.h"
#include "ui/android/ui_android_export.h"
#include "ui/gfx/geometry/rect.h"
@@ -29,7 +29,7 @@ class UI_ANDROID_EXPORT ResourceManagerImpl : public ResourceManager {
base::android::ScopedJavaLocalRef<jobject> GetJavaObject() override;
Resource* GetResource(AndroidResourceType res_type, int res_id) override;
Resource* GetStaticResourceWithTint(
- int res_id, int tint_color) override;
+ int res_id, SkColor tint_color) override;
void RemoveUnusedTints(const std::unordered_set<int>& used_tints) override;
void PreloadResource(AndroidResourceType res_type, int res_id) override;
CrushedSpriteResource* GetCrushedSpriteResource(
@@ -86,11 +86,11 @@ class UI_ANDROID_EXPORT ResourceManagerImpl : public ResourceManager {
int metadata_res_id,
bool reloading);
- typedef IDMap<Resource, IDMapOwnPointer> ResourceMap;
- typedef IDMap<CrushedSpriteResource, IDMapOwnPointer>
- CrushedSpriteResourceMap;
- typedef std::unordered_map<int, std::unique_ptr<ResourceMap> >
- TintedResourceMap;
+ using ResourceMap = std::unordered_map<int, std::unique_ptr<Resource>>;
+ using CrushedSpriteResourceMap =
+ std::unordered_map<int, std::unique_ptr<CrushedSpriteResource>>;
+ using TintedResourceMap =
+ std::unordered_map<SkColor, std::unique_ptr<ResourceMap>>;
cc::LayerTreeHost* host_;
ResourceMap resources_[ANDROID_RESOURCE_TYPE_COUNT];

Powered by Google App Engine
This is Rietveld 408576698