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

chrome/browser/chromeos/accessibility/accessibility_highlight_manager.cc

Index: chrome/browser/chromeos/accessibility/accessibility_highlight_manager.cc
diff --git a/chrome/browser/chromeos/accessibility/accessibility_highlight_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_highlight_manager.cc
index 3af8b1f0338328ecdc3106f5435a5b83208b50fc..9f7afdd1cac35c86890998561163f34fb2e1b2ec 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_highlight_manager.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_highlight_manager.cc
@@ -15,16 +15,6 @@ 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();
@@ -34,9 +24,6 @@ ui::InputMethod* GetInputMethod(aura::Window* root_window) {
 }  // namespace
 
 AccessibilityHighlightManager::AccessibilityHighlightManager() {
-  focus_rect_ = OffscreenRect();
-  cursor_point_ = OffscreenPoint();
-  caret_point_ = OffscreenPoint();
 }
 
 AccessibilityHighlightManager::~AccessibilityHighlightManager() {
@@ -47,10 +34,8 @@ AccessibilityHighlightManager::~AccessibilityHighlightManager() {
   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_) {
@@ -149,14 +134,14 @@ void AccessibilityHighlightManager::UpdateFocusAndCaretHighlights() {
         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);
@@ -164,15 +149,12 @@ void AccessibilityHighlightManager::UpdateFocusAndCaretHighlights() {
 }
 
 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