Invalidate caret during paint invalidation

third_party/WebKit/Source/core/layout/LayoutBlock.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc.
  *               All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 468 matching lines @@
   bool isPointInOverflowControl(HitTestResult&,
                                 const LayoutPoint& locationInContainer,
                                 const LayoutPoint& accumulatedOffset) const;
 
   void computeBlockPreferredLogicalWidths(LayoutUnit& minLogicalWidth,
                                           LayoutUnit& maxLogicalWidth) const;
 
   bool isSelectionRoot() const;
 
  public:
-  bool hasCursorCaret() const;
-  bool hasDragCaret() const;
-  bool hasCaret() const { return hasCursorCaret() || hasDragCaret(); }
+  bool shouldPaintCursorCaret() const;
+  bool shouldPaintDragCaret() const;
+  bool shouldPaintCarets() const {
+    return shouldPaintCursorCaret() || shouldPaintDragCaret();
+  }
 
  protected:
   PaintInvalidationReason invalidatePaintIfNeeded(
       const PaintInvalidationState&) override;
   PaintInvalidationReason invalidatePaintIfNeeded(
       const PaintInvalidatorContext&) const override;
 
+  void clearPreviousVisualRects() override;
+
  private:
   LayoutRect localCaretRect(InlineBox*,
                             int caretOffset,
                             LayoutUnit* extraWidthToEndOfLine = nullptr) final;
   bool isInlineBoxWrapperActuallyChild() const;
 
   Position positionForBox(InlineBox*, bool start = true) const;
 
   // End helper functions and structs used by layoutBlockChildren.
 
@@ skipping 55 matching lines @@
   // TODO(lunalu): Temporary in order to ensure compatibility with existing
   // layout test results.
   virtual void adjustChildDebugRect(LayoutRect&) const {}
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock());
 
 }  // namespace blink
 
 #endif  // LayoutBlock_h