Improve perforance for component IME extensions initialization by using map instead of vector in Co…

chromeos/ime/component_extension_ime_manager.h

Index: chromeos/ime/component_extension_ime_manager.h
diff --git a/chromeos/ime/component_extension_ime_manager.h b/chromeos/ime/component_extension_ime_manager.h
index c455712d8f32ad952bc88df7cdb87b53e78682f8..ee00fb2ce2a5e9fcc61e2f77e0dcd623200233f3 100644
--- a/chromeos/ime/component_extension_ime_manager.h
+++ b/chromeos/ime/component_extension_ime_manager.h
@@ -5,6 +5,7 @@
 #ifndef CHROMEOS_IME_COMPONENT_EXTENSION_IME_MANAGER_H_
 #define CHROMEOS_IME_COMPONENT_EXTENSION_IME_MANAGER_H_
 
+#include <map>
 #include <set>
 
 #include "base/files/file_path.h"
@@ -88,20 +89,6 @@ class CHROMEOS_EXPORT ComponentExtensionIMEManager {
   // Returns true if |extension_id| is whitelisted component extension.
   bool IsWhitelistedExtension(const std::string& extension_id);
 
-  // Returns InputMethodId. This function returns empty string if |extension_id|
-  // and |engine_id| is not a whitelisted component extention IME.
-  std::string GetId(const std::string& extension_id,
-                    const std::string& engine_id);
-
-  // Returns localized name of |input_method_id|.
-  std::string GetName(const std::string& input_method_id);
-
-  // Returns localized description of |input_method_id|.
-  std::string GetDescription(const std::string& input_method_id);
-
-  // Returns list of input method id associated with |language|.
-  std::vector<std::string> ListIMEByLanguage(const std::string& language);
-
   // Returns all IME as InputMethodDescriptors.
   input_method::InputMethodDescriptors GetAllIMEAsInputMethodDescriptor();
 
@@ -113,14 +100,19 @@ class CHROMEOS_EXPORT ComponentExtensionIMEManager {
   // |input_method_id|. This function retruns true if it is found, otherwise
   // returns false. |out_extension| and |out_engine| can be NULL.
   bool FindEngineEntry(const std::string& input_method_id,
-                       ComponentExtensionIME* out_extension,
-                       ComponentExtensionEngine* out_engine);
+                       ComponentExtensionIME* out_extension);
 
   bool IsInLoginLayoutWhitelist(const std::vector<std::string>& layouts);
 
   scoped_ptr<ComponentExtensionIMEManagerDelegate> delegate_;
 
-  std::vector<ComponentExtensionIME> component_extension_imes_;
+  // The map of extension_id to ComponentExtensionIME instance.
+  // It's filled by Initialize() method and never changed during runtime.

[Alexander Alekseev, 2014/08/12 13:47:22]

This is wrong ;-)

ComponentExtensionIMEManager is a singleton.
InputMethodManagerImpl::InitializeComponentExtension() is called for every new
user. It calls ComponentExtensionIMEManager::Initialize() and settings from the
new user are added to the current set ;-)

(And it all works because they are added, but not replaced.)

[Shu Chen, 2014/08/12 14:30:58]

But the whitelisted IME extensions are the same, with
ComponentExtensionIMEManager::Initialize() being called multiple times for
different users, the contents of |component_extension_imes_| remains the same.

Maybe it's necessary to speed it up to avoid reinitializing for different users.
;-)

[Alexander Alekseev, 2014/08/12 14:42:31]

Yes. I think so ;-)

+  std::map<std::string, ComponentExtensionIME> component_extension_imes_;
+
+  // For quick check the validity of a given input method id.
+  // It's filled by Initialize() method and never changed during runtime.
+  std::set<std::string> input_method_id_set_;
 
   std::set<std::string> login_layout_set_;