Modify the accessibility highlight manager to account for the text caret being drawn outside of the…

chrome/browser/chromeos/accessibility/accessibility_highlight_manager.cc

 // Copyright (c) 2016 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 "chrome/browser/chromeos/accessibility/accessibility_highlight_manager.h"

[xiyuan, 2017/06/22 17:19:13]

nit: insert an empty line after

[Maajid, 2017/06/27 02:25:16]

Done.

 #include "ash/shell.h"
-#include "chrome/browser/chromeos/accessibility/accessibility_highlight_manager.h"
 #include "chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h"
 #include "content/public/browser/focused_node_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/wm/core/coordinate_conversion.h"
 #include "ui/wm/core/cursor_manager.h"
+#include "ui/wm/public/activation_client.h"
 
 namespace chromeos {
 
 namespace {
 
 ui::InputMethod* GetInputMethod(aura::Window* root_window) {
   if (root_window->GetHost())
     return root_window->GetHost()->GetInputMethod();
   return nullptr;
 }
 
 }  // namespace
 
-AccessibilityHighlightManager::AccessibilityHighlightManager() {
-}
+AccessibilityHighlightManager::AccessibilityHighlightManager() {}
 
 AccessibilityHighlightManager::~AccessibilityHighlightManager() {
   // No need to do anything during shutdown
   if (!ash::Shell::HasInstance())
     return;
 
   AccessibilityFocusRingController::GetInstance()->SetFocusRing(
       std::vector<gfx::Rect>(),
       AccessibilityFocusRingController::FADE_OUT_FOCUS_RING);
   AccessibilityFocusRingController::GetInstance()->HideCaretRing();
@@ skipping 73 matching lines @@
 void AccessibilityHighlightManager::OnTextInputStateChanged(
     const ui::TextInputClient* client) {
   if (!client || client->GetTextInputType() == ui::TEXT_INPUT_TYPE_NONE) {
     caret_visible_ = false;
     UpdateFocusAndCaretHighlights();
   }
 }
 
 void AccessibilityHighlightManager::OnCaretBoundsChanged(
     const ui::TextInputClient* client) {
+  if (!client || client->GetTextInputType() == ui::TEXT_INPUT_TYPE_NONE) {
+    caret_visible_ = false;
+    return;
+  }
   gfx::Rect caret_bounds = client->GetCaretBounds();
-  caret_point_ = caret_bounds.CenterPoint();
-  caret_visible_ = client->GetTextInputType() != ui::TEXT_INPUT_TYPE_NONE &&
-                   (caret_bounds.width() || caret_bounds.height());
+  gfx::Point new_caret_point = caret_bounds.CenterPoint();
+  ::wm::ConvertPointFromScreen(ash::Shell::GetPrimaryRootWindow(),
+                               &new_caret_point);
+  if (new_caret_point == caret_point_)
+    return;
+  caret_point_ = new_caret_point;
+  caret_visible_ = IsCaretVisible(caret_bounds);
   UpdateFocusAndCaretHighlights();
 }
 
 void AccessibilityHighlightManager::OnCursorVisibilityChanged(bool is_visible) {
   UpdateCursorHighlight();
 }
 
 bool AccessibilityHighlightManager::IsCursorVisible() {
   return ash::Shell::Get()->cursor_manager()->IsCursorVisible();
 }
 
+bool AccessibilityHighlightManager::IsCaretVisible(
+    const gfx::Rect caret_bounds) {
+  aura::Window* root_window = ash::Shell::GetPrimaryRootWindow();
+  aura::Window* active_window =
+      ::wm::GetActivationClient(root_window)->GetActiveWindow();
+  if (!active_window)
+    active_window = root_window;
+  return (caret_bounds.width() || caret_bounds.height()) &&
+         active_window->GetBoundsInScreen().Contains(caret_point_);
+}
+
 void AccessibilityHighlightManager::UpdateFocusAndCaretHighlights() {
   auto* controller = AccessibilityFocusRingController::GetInstance();
 
   // The caret highlight takes precedence over the focus highlight if
   // both are visible.
   if (caret_ && caret_visible_) {
     controller->SetCaretRing(caret_point_);
     controller->SetFocusRing(
         std::vector<gfx::Rect>(),
         AccessibilityFocusRingController::FADE_OUT_FOCUS_RING);
@@ skipping 15 matching lines @@
 void AccessibilityHighlightManager::UpdateCursorHighlight() {
   if (cursor_ && IsCursorVisible()) {
     AccessibilityFocusRingController::GetInstance()->SetCursorRing(
         cursor_point_);
   } else {
     AccessibilityFocusRingController::GetInstance()->HideCursorRing();
   }
 }
 
 }  // namespace chromeos