Invalidate caret during paint invalidation

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

Index: third_party/WebKit/Source/core/layout/LayoutObject.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.cpp b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
index 4ecf13410cd9506f80d8d1ce809a7c280d577bed..7af9067933fc53b37bde6990b3eceadb61161a13 100644
--- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
@@ -1514,13 +1514,11 @@ StyleDifference LayoutObject::adjustStyleDifference(
   // needed if we have style or text affected by these properties.
   if (diff.textDecorationOrColorChanged() && !diff.needsPaintInvalidation()) {
     if (style()->hasBorder() || style()->hasOutline() ||
-        style()->hasBackgroundRelatedColorReferencingCurrentColor()
+        style()->hasBackgroundRelatedColorReferencingCurrentColor() ||
         // Skip any text nodes that do not contain text boxes. Whitespace cannot
         // be skipped or we will miss invalidating decorations (e.g.,
         // underlines).
-        || (isText() && !isBR() && toLayoutText(this)->hasTextBoxes())
-        // Caret is painted in text color.
-        || (isLayoutBlock() && toLayoutBlock(this)->hasCaret()) ||

[chrishtr, 2017/02/03 02:07:01]

Why can this line go?

[Xianzhu, 2017/02/03 04:31:28]

Now we always check for caret change in each frame in
CaretDisplayItemClient::updateForPaintInvalidation() which is indirectly called
from FrameView::prePaint and FrameView::invalidateTreeIfNeededRecursive(). This
makes all paint invalidations of carets enclosed in CaretDisplayItemClient, with
little additional cost*. Caret color is also checked in
CaretDisplayItemClient::updateForPaintInvalidation().

This is also the reason that some setCaretRectNeedsUpdate calls are removed.

* Actually in many cases the cost is reduced because now we call
CaretDisplayItemClient::computeCaretRect() and
CaretDisplayItemClient::caretLayoutObject() only once in each frame, instead of
many times before.

+        (isText() && !isBR() && toLayoutText(this)->hasTextBoxes()) ||
         (isSVG() && style()->svgStyle().isFillColorCurrentColor()) ||
         (isSVG() && style()->svgStyle().isStrokeColorCurrentColor()) ||
         isListMarker())