Explicitly show and hide accessible rings rather than using offscreen coords.

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 "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/cursor_manager.h"
 
 namespace chromeos {
 
 namespace {
 
-const gfx::Rect& OffscreenRect() {
-  CR_DEFINE_STATIC_LOCAL(const gfx::Rect, r, (INT_MIN, INT_MIN, 0, 0));
-  return r;
-}
-
-const gfx::Point& OffscreenPoint() {
-  CR_DEFINE_STATIC_LOCAL(const gfx::Point, p, (INT_MIN, INT_MIN));
-  return p;
-}
-
 ui::InputMethod* GetInputMethod(aura::Window* root_window) {
   if (root_window->GetHost())
     return root_window->GetHost()->GetInputMethod();
   return nullptr;
 }
 
 }  // namespace
 
 AccessibilityHighlightManager::AccessibilityHighlightManager() {
-  focus_rect_ = OffscreenRect();
-  cursor_point_ = OffscreenPoint();
-  caret_point_ = OffscreenPoint();
 }
 
 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()->SetCaretRing(
-      OffscreenPoint());
-  AccessibilityFocusRingController::GetInstance()->SetCursorRing(
-      OffscreenPoint());
+  AccessibilityFocusRingController::GetInstance()->HideCaretRing();
+  AccessibilityFocusRingController::GetInstance()->HideCursorRing();
 
   ash::Shell* shell = ash::Shell::GetInstance();
   if (shell && registered_observers_) {
     shell->RemovePreTargetHandler(this);
     shell->cursor_manager()->RemoveObserver(this);
 
     aura::Window* root_window = shell->GetPrimaryRootWindow();
     ui::InputMethod* input_method = GetInputMethod(root_window);
     input_method->RemoveObserver(this);
   }
@@ skipping 78 matching lines @@
   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);
   } else if (focus_) {
-    controller->SetCaretRing(OffscreenPoint());
+    controller->HideCaretRing();
     std::vector<gfx::Rect> rects;
     if (!focus_rect_.IsEmpty())
       rects.push_back(focus_rect_);
     controller->SetFocusRing(
         rects, AccessibilityFocusRingController::FADE_OUT_FOCUS_RING);
   } else {
-    controller->SetCaretRing(OffscreenPoint());
+    controller->HideCaretRing();
     controller->SetFocusRing(
         std::vector<gfx::Rect>(),
         AccessibilityFocusRingController::FADE_OUT_FOCUS_RING);
   }
 }
 
 void AccessibilityHighlightManager::UpdateCursorHighlight() {
-  gfx::Point point = cursor_point_;
-
-  if (!cursor_)
-    point = OffscreenPoint();
-
-  if (!IsCursorVisible())
-    point = OffscreenPoint();
-
-  AccessibilityFocusRingController::GetInstance()->SetCursorRing(point);
+  if (cursor_ && IsCursorVisible()) {
+    AccessibilityFocusRingController::GetInstance()->SetCursorRing(
+        cursor_point_);
+  } else {
+    AccessibilityFocusRingController::GetInstance()->HideCursorRing();
+  }
 }
 
 }  // namespace chromeos