[refactor] content::TextInputManager - Make some methods const and initialize/cleanup IME maps

content/browser/renderer_host/text_input_manager.cc

Index: content/browser/renderer_host/text_input_manager.cc
diff --git a/content/browser/renderer_host/text_input_manager.cc b/content/browser/renderer_host/text_input_manager.cc
index eed20121103d96cdaaec68cdcafea5ecacc241a6..cc9cc625ff853e72489d50e2e7354001a60819f7 100644
--- a/content/browser/renderer_host/text_input_manager.cc
+++ b/content/browser/renderer_host/text_input_manager.cc
@@ -52,23 +52,23 @@ RenderWidgetHostImpl* TextInputManager::GetActiveWidget() const {
                         : nullptr;
 }
 
-const TextInputState* TextInputManager::GetTextInputState() {
-  return !!active_view_ ? &text_input_state_map_[active_view_] : nullptr;
+const TextInputState* TextInputManager::GetTextInputState() const{
+  return !!active_view_ ? &text_input_state_map_.at(active_view_) : nullptr;
 }
 
-gfx::Rect TextInputManager::GetSelectionBoundsRect() {
+gfx::Rect TextInputManager::GetSelectionBoundsRect() const {
   if (!active_view_)
     return gfx::Rect();
 
   return gfx::RectBetweenSelectionBounds(
-      selection_region_map_[active_view_].anchor,
-      selection_region_map_[active_view_].focus);
+      selection_region_map_.at(active_view_).anchor,
+      selection_region_map_.at(active_view_).focus);
 }
 
 const std::vector<gfx::Rect>*
-TextInputManager::GetCompositionCharacterBounds() {
+TextInputManager::GetCompositionCharacterBounds() const {
   return !!active_view_
-             ? &composition_range_info_map_[active_view_].character_bounds
+             ? &composition_range_info_map_.at(active_view_).character_bounds
              : nullptr;
 }
 
@@ -178,12 +178,17 @@ void TextInputManager::Register(RenderWidgetHostViewBase* view) {
   DCHECK(!IsRegistered(view));
 
   text_input_state_map_[view] = TextInputState();
+  selection_region_map_[view] = SelectionRegion();
+  composition_range_info_map_[view] = CompositionRangeInfo();

[Charlie Reis, 2016/07/20 23:08:20]

Yikes.  I would suggest adding a comment to the .h file where this block of
members is declared, mentioning (reminding) they're initialized in Register and
cleared in Unregister (per view).

[EhsanK, 2016/07/21 16:06:02]

Done.

 }
 
 void TextInputManager::Unregister(RenderWidgetHostViewBase* view) {
   DCHECK(IsRegistered(view));
 
   text_input_state_map_.erase(view);
+  selection_region_map_.erase(view);
+  composition_range_info_map_.erase(view);
+
   if (active_view_ == view) {
     active_view_ = nullptr;
     NotifyObserversAboutInputStateUpdate(view, true);
@@ -233,4 +238,4 @@ TextInputManager::CompositionRangeInfo::CompositionRangeInfo(
 
 TextInputManager::CompositionRangeInfo::~CompositionRangeInfo() {}
 
-}  // namespace content
+}  // namespace content