Invalidate caret during paint invalidation

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

 /*
  * 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, 2011 Apple Inc.
  *               All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. 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
@@ skipping 82 matching lines @@
       m_hasMarginBeforeQuirk(false),
       m_hasMarginAfterQuirk(false),
       m_beingDestroyed(false),
       m_hasMarkupTruncation(false),
       m_widthAvailableToChildrenChanged(false),
       m_heightAvailableToChildrenChanged(false),
       m_isSelfCollapsing(false),
       m_descendantsWithFloatsMarkedForLayout(false),
       m_hasPositionedObjects(false),
       m_hasPercentHeightDescendants(false),
-      m_paginationStateChanged(false) {
+      m_paginationStateChanged(false),
+      m_hasPreviousCaretVisualRects(false),
+      m_caretsNeedPaintInvalidation(false) {
   // LayoutBlockFlow calls setChildrenInline(true).
   // By default, subclasses do not have inline children.
 }
 
 void LayoutBlock::removeFromGlobalMaps() {
   if (hasPositionedObjects()) {
     std::unique_ptr<TrackedLayoutBoxListHashSet> descendants =
         gPositionedDescendantsMap->take(this);
     ASSERT(!descendants->isEmpty());
     for (LayoutBox* descendant : *descendants) {
@@ skipping 10 matching lines @@
       descendant->setPercentHeightContainer(nullptr);
     }
   }
 }
 
 LayoutBlock::~LayoutBlock() {
   removeFromGlobalMaps();
 }
 
 void LayoutBlock::willBeDestroyed() {
+  BlockPaintInvalidator::blockWillBeDestroyed(*this);
+
   if (!documentBeingDestroyed() && parent())
     parent()->dirtyLinesFromChangedChild(this);
 
   if (TextAutosizer* textAutosizer = document().textAutosizer())
     textAutosizer->destroy(this);
 
   LayoutBox::willBeDestroyed();
 }
 
 void LayoutBlock::styleWillChange(StyleDifference diff,
@@ skipping 56 matching lines @@
   return oldStyle.borderTopWidth() != newStyle.borderTopWidth() ||
          oldStyle.borderBottomWidth() != newStyle.borderBottomWidth() ||
          oldStyle.paddingTop() != newStyle.paddingTop() ||
          oldStyle.paddingBottom() != newStyle.paddingBottom();
 }
 
 void LayoutBlock::styleDidChange(StyleDifference diff,
                                  const ComputedStyle* oldStyle) {
   LayoutBox::styleDidChange(diff, oldStyle);
 
+  // Carets are painted in text color.
+  if (diff.textDecorationOrColorChanged() && hasCaret())
+    setCaretsNeedPaintInvalidation();
+
   const ComputedStyle& newStyle = styleRef();
 
   if (oldStyle && parent()) {
     if (oldStyle->position() != newStyle.position() &&
         newStyle.position() != StaticPosition) {
       // In LayoutObject::styleWillChange() we already removed ourself from our
       // old containing block's positioned descendant list, and we will be
       // inserted to the new containing block's list during layout. However the
       // positioned descendant layout logic assumes layout objects to obey
       // parent-child order in the list. Remove our descendants here so they
@@ skipping 800 matching lines @@
 PaintInvalidationReason LayoutBlock::invalidatePaintIfNeeded(
     const PaintInvalidationState& paintInvalidationState) {
   return LayoutBox::invalidatePaintIfNeeded(paintInvalidationState);
 }
 
 PaintInvalidationReason LayoutBlock::invalidatePaintIfNeeded(
     const PaintInvalidatorContext& context) const {
   return BlockPaintInvalidator(*this, context).invalidatePaintIfNeeded();
 }
 
+void LayoutBlock::clearPreviousVisualRects() {
+  LayoutBox::clearPreviousVisualRects();
+  BlockPaintInvalidator::clearPreviousCaretVisualRects(*this);
+}
+
 void LayoutBlock::removePositionedObjects(
     LayoutObject* o,
     ContainingBlockState containingBlockState) {
   TrackedLayoutBoxListHashSet* positionedDescendants = positionedObjects();
   if (!positionedDescendants)
     return;
 
   Vector<LayoutBox*, 16> deadObjects;
   for (auto* positionedObject : *positionedDescendants) {
     if (!o || (positionedObject->isDescendantOf(o) && o != positionedObject)) {
@@ skipping 1165 matching lines @@
   }
 
   return availableHeight;
 }
 
 bool LayoutBlock::hasDefiniteLogicalHeight() const {
   return availableLogicalHeightForPercentageComputation() != LayoutUnit(-1);
 }
 
 }  // namespace blink