Correctly fallback to caret bounds when composition_head is not provided

ui/base/ime/input_method_chromeos.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/ime/input_method_chromeos.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cstring>
@@ skipping 162 matching lines @@
   if (GetEngine())
     GetEngine()->SetCompositionBounds(GetCompositionBounds(client));
 
   chromeos::IMECandidateWindowHandlerInterface* candidate_window =
       ui::IMEBridge::Get()->GetCandidateWindowHandler();
   if (!candidate_window)
     return;
 
   const gfx::Rect caret_rect = client->GetCaretBounds();
 
-  // Pepper doesn't support composition bounds, so fall back to caret bounds to
-  // avoid a bad user experience (the IME window moved to upper left corner).
   gfx::Rect composition_head;
   if (client->HasCompositionText())
     client->GetCompositionCharacterBounds(0, &composition_head);
-  else
+
+  // Pepper doesn't support composition bounds, so fall back to caret bounds to
+  // avoid a bad user experience (the IME window moved to upper left corner).
+  if (composition_head.IsEmpty())
     composition_head = caret_rect;
   candidate_window->SetCursorBounds(caret_rect, composition_head);
 
   gfx::Range text_range;
   gfx::Range selection_range;
   base::string16 surrounding_text;
   if (!client->GetTextRange(&text_range) ||
       !client->GetTextFromRange(text_range, &surrounding_text) ||
       !client->GetSelectionRange(&selection_range)) {
     previous_surrounding_text_.clear();
@@ skipping 437 matching lines @@
 bool InputMethodChromeOS::IsNonPasswordInputFieldFocused() {
   TextInputType type = GetTextInputType();
   return (type != TEXT_INPUT_TYPE_NONE) && (type != TEXT_INPUT_TYPE_PASSWORD);
 }
 
 bool InputMethodChromeOS::IsInputFieldFocused() {
   return GetTextInputType() != TEXT_INPUT_TYPE_NONE;
 }
 
 }  // namespace ui