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 116 matching lines @@
 }
 
 LayoutBlock::~LayoutBlock() {
   removeFromGlobalMaps();
 }
 
 void LayoutBlock::willBeDestroyed() {
   if (!documentBeingDestroyed() && parent())
     parent()->dirtyLinesFromChangedChild(this);
 
+  if (LocalFrame* frame = this->frame()) {
+    frame->selection().layoutBlockWillBeDestroyed(*this);
+    frame->page()->dragCaret().layoutBlockWillBeDestroyed(*this);
+  }
+
   if (TextAutosizer* textAutosizer = document().textAutosizer())
     textAutosizer->destroy(this);
 
   LayoutBox::willBeDestroyed();
 }
 
 void LayoutBlock::styleWillChange(StyleDifference diff,
                                   const ComputedStyle& newStyle) {
   const ComputedStyle* oldStyle = style();
 
@@ skipping 870 matching lines @@
   }
 }
 
 PaintInvalidationReason LayoutBlock::invalidatePaintIfNeeded(
     const PaintInvalidationState& paintInvalidationState) {
   return LayoutBox::invalidatePaintIfNeeded(paintInvalidationState);
 }
 
 PaintInvalidationReason LayoutBlock::invalidatePaintIfNeeded(
     const PaintInvalidatorContext& context) const {
-  return BlockPaintInvalidator(*this, context).invalidatePaintIfNeeded();
+  return BlockPaintInvalidator(*this).invalidatePaintIfNeeded(context);
+}
+
+void LayoutBlock::clearPreviousVisualRects() {
+  LayoutBox::clearPreviousVisualRects();
+  BlockPaintInvalidator(*this).clearPreviousVisualRects();
 }
 
 void LayoutBlock::removePositionedObjects(
     LayoutObject* o,
     ContainingBlockState containingBlockState) {
   TrackedLayoutBoxListHashSet* positionedDescendants = positionedObjects();
   if (!positionedDescendants)
     return;
 
   Vector<LayoutBox*, 16> deadObjects;
@@ skipping 797 matching lines @@
     result.setNodeAndPosition(n, point);
 }
 
 // An inline-block uses its inlineBox as the inlineBoxWrapper,
 // so the firstChild() is nullptr if the only child is an empty inline-block.
 inline bool LayoutBlock::isInlineBoxWrapperActuallyChild() const {
   return isInlineBlockOrInlineTable() && !size().isEmpty() && node() &&
          editingIgnoresContent(*node());
 }
 
-bool LayoutBlock::hasCursorCaret() const {
-  LocalFrame* frame = this->frame();
-  return frame->selection().hasCaretIn(*this);
+bool LayoutBlock::shouldPaintCursorCaret() const {
+  return frame()->selection().shouldPaintCaret(*this);
 }
 
-bool LayoutBlock::hasDragCaret() const {
-  LocalFrame* frame = this->frame();
-  DragCaret& dragCaret = frame->page()->dragCaret();
-  return dragCaret.hasCaretIn(*this);
+bool LayoutBlock::shouldPaintDragCaret() const {
+  return frame()->page()->dragCaret().shouldPaintCaret(*this);
 }
 
 LayoutRect LayoutBlock::localCaretRect(InlineBox* inlineBox,
                                        int caretOffset,
                                        LayoutUnit* extraWidthToEndOfLine) {
   // Do the normal calculation in most cases.
   if ((firstChild() && !firstChild()->isPseudoElement()) ||
       isInlineBoxWrapperActuallyChild())
     return LayoutBox::localCaretRect(inlineBox, caretOffset,
                                      extraWidthToEndOfLine);
@@ skipping 341 matching lines @@
   }
 
   return availableHeight;
 }
 
 bool LayoutBlock::hasDefiniteLogicalHeight() const {
   return availableLogicalHeightForPercentageComputation() != LayoutUnit(-1);
 }
 
 }  // namespace blink