Make CaretBase a DisplayItemClient.

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

Index: third_party/WebKit/Source/core/layout/LayoutBlock.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBlock.cpp b/third_party/WebKit/Source/core/layout/LayoutBlock.cpp
index de0d5baf6520b1c5c58ce5c319418f4b9cb0cab6..64c9798093cc4d4f29486ab75d447b43cad23b99 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBlock.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBlock.cpp
@@ -226,6 +226,15 @@ void LayoutBlock::styleDidChange(StyleDifference diff, const ComputedStyle* oldS
     m_heightAvailableToChildrenChanged |= oldStyle && diff.needsFullLayout() && needsLayout() && borderOrPaddingLogicalDimensionChanged(*oldStyle, newStyle, LogicalHeight);
 }
 
+void LayoutBlock::invalidateCaret() const
+{
+    if (hasCaret()) {
+        ObjectPaintInvalidator(*this).slowSetPaintingLayerNeedsRepaint();
+        frame()->selection().setCaretRectNeedsUpdate();
+        frame()->selection().invalidateCaretRect(true);
+    }
+}
+
 void LayoutBlock::updateFromStyle()
 {
     LayoutBox::updateFromStyle();
@@ -925,6 +934,14 @@ void LayoutBlock::removePositionedObject(LayoutBox* o)
     }
 }
 
+PaintInvalidationReason LayoutBlock::invalidatePaintIfNeeded(const PaintInvalidationState& paintInvalidationState)
+{
+    PaintInvalidationReason reason = LayoutBox::invalidatePaintIfNeeded(paintInvalidationState);
+    if (reason != PaintInvalidationNone)
+        invalidateCaret();
+    return reason;
+}
+
 void LayoutBlock::removePositionedObjects(LayoutBlock* o, ContainingBlockState containingBlockState)
 {
     TrackedLayoutBoxListHashSet* positionedDescendants = positionedObjects();