Invalidate caret during paint invalidation

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

Index: third_party/WebKit/Source/core/layout/LayoutBlock.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutBlock.h b/third_party/WebKit/Source/core/layout/LayoutBlock.h
index d2014ceca0ec4cc5096d16ab95235954deaecd7b..7b4fdaf733585d3023908794230f86783edcfede 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBlock.h
+++ b/third_party/WebKit/Source/core/layout/LayoutBlock.h
@@ -486,9 +486,11 @@ class CORE_EXPORT LayoutBlock : public LayoutBox {
   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(
@@ -496,6 +498,8 @@ class CORE_EXPORT LayoutBlock : public LayoutBox {
   PaintInvalidationReason invalidatePaintIfNeeded(
       const PaintInvalidatorContext&) const override;
 
+  void clearPreviousVisualRects() override;
+
  private:
   LayoutRect localCaretRect(InlineBox*,
                             int caretOffset,