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

chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_UI_ACCESSIBILITY_FOCUS_RING_CONTROLLER_H_
 #define CHROME_BROWSER_CHROMEOS_UI_ACCESSIBILITY_FOCUS_RING_CONTROLLER_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 50 matching lines @@
   // overlapping rectangles are combined first. This function is protected
   // so it can be unit-tested.
   void RectsToRings(const std::vector<gfx::Rect>& rects,
                     std::vector<AccessibilityFocusRing>* rings) const;
 
   virtual int GetMargin() const;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(AccessibilityFocusRingControllerTest,
                            CursorWorksOnMultipleDisplays);
+  FRIEND_TEST_ALL_PREFIXES(AccessibilityFocusRingControllerTest,
+                           CaretRingDrawnOnlyWithinBounds);
 
   // FocusRingLayerDelegate overrides.
   void OnDeviceScaleFactorChanged() override;
   void OnAnimationStep(base::TimeTicks timestamp) override;
 
   void UpdateFocusRingsFromFocusRects();
 
   void AnimateFocusRings(base::TimeTicks timestamp);
   void AnimateCursorRing(base::TimeTicks timestamp);
   void AnimateCaretRing(base::TimeTicks timestamp);
 
   AccessibilityFocusRing RingFromSortedRects(
       const std::vector<gfx::Rect>& rects) const;
-  void SplitIntoParagraphShape(
-      const std::vector<gfx::Rect>& rects,
-      gfx::Rect* top,
-      gfx::Rect* middle,
-      gfx::Rect* bottom) const;
+  void SplitIntoParagraphShape(const std::vector<gfx::Rect>& rects,
+                               gfx::Rect* top,
+                               gfx::Rect* middle,
+                               gfx::Rect* bottom) const;
   bool Intersects(const gfx::Rect& r1, const gfx::Rect& r2) const;
 
   struct LayerAnimationInfo {
     base::TimeTicks start_time;
     base::TimeTicks change_time;
     base::TimeDelta fade_in_time;
     base::TimeDelta fade_out_time;
     float opacity = 0;
     bool smooth = false;
   };
@@ skipping 18 matching lines @@
   std::unique_ptr<AccessibilityCursorRingLayer> caret_layer_;
 
   friend struct base::DefaultSingletonTraits<AccessibilityFocusRingController>;
 
   DISALLOW_COPY_AND_ASSIGN(AccessibilityFocusRingController);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_UI_ACCESSIBILITY_FOCUS_RING_CONTROLLER_H_