Invalidate caret during paint invalidation

third_party/WebKit/Source/core/editing/DragCaret.cpp

 /*
  * Copyright (C) 2004, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 22 matching lines @@
 namespace blink {
 
 DragCaret::DragCaret() : m_caretBase(new CaretDisplayItemClient()) {}
 
 DragCaret::~DragCaret() = default;
 
 DragCaret* DragCaret::create() {
   return new DragCaret;
 }
 
+LayoutBlock* DragCaret::caretLayoutBlock() const {
+  LayoutBlock* block =
+      CaretDisplayItemClient::caretLayoutObject(m_position.anchorNode());
+  if (!block)
+    return nullptr;
+  if (!rootEditableElementOf(m_position.position()))
+    return nullptr;
+  return block;
+}
+
 bool DragCaret::hasCaretIn(const LayoutBlock& layoutBlock) const {
-  Node* node = m_position.anchorNode();
-  if (!node)
-    return false;
-  if (layoutBlock != CaretDisplayItemClient::caretLayoutObject(node))
-    return false;
-  return rootEditableElementOf(m_position.position());
+  return layoutBlock == this->caretLayoutBlock();
 }
 
 bool DragCaret::isContentRichlyEditable() const {
   return isRichlyEditablePosition(m_position.position());
 }
 
-void DragCaret::invalidateCaretRect(Node* node,
-                                    const LayoutRect& caretLocalRect) {
-  // TODO(editing-dev): The use of updateStyleAndLayout
-  // needs to be audited.  See http://crbug.com/590369 for more details.
-  // In the long term we should use idle time spell checker to prevent
-  // synchronous layout caused by spell checking (see crbug.com/517298).
-  node->document().updateStyleAndLayoutTree();
-  if (!hasEditableStyle(*node))
-    return;
-  m_caretBase->invalidateLocalCaretRect(node, caretLocalRect);
-}
+void DragCaret::setCaretPosition(const PositionWithAffinity& position) {
+  if (LayoutBlock* block = caretLayoutBlock())
+    block->setMayNeedPaintInvalidation();
 
-void DragCaret::setCaretPosition(const PositionWithAffinity& position) {
-  // for querying Layer::compositingState()
-  // This code is probably correct, since it doesn't occur in a stack that
-  // involves updating compositing state.
-  DisableCompositingQueryAsserts disabler;
-
-  if (Node* node = m_position.anchorNode())
-    invalidateCaretRect(node, m_caretLocalRect);
   m_position = createVisiblePosition(position).toPositionWithAffinity();
   Document* document = nullptr;
   if (Node* node = m_position.anchorNode()) {
-    invalidateCaretRect(node, m_caretLocalRect);
     document = &node->document();
     setContext(document);
   }
   if (m_position.isNull()) {
     m_caretLocalRect = LayoutRect();
   } else {
     DCHECK(!m_position.isOrphan());
     document->updateStyleAndLayoutTree();
     m_caretLocalRect = CaretDisplayItemClient::computeCaretRect(m_position);
   }
+
+  if (LayoutBlock* block = caretLayoutBlock())
+    block->setMayNeedPaintInvalidation();
 }
 
 void DragCaret::nodeChildrenWillBeRemoved(ContainerNode& container) {
   if (!hasCaret() || !container.inActiveDocument())
     return;
   Node* const anchorNode = m_position.position().anchorNode();
   if (!anchorNode || anchorNode == container)
     return;
   if (!container.isShadowIncludingInclusiveAncestorOf(anchorNode))
     return;
@@ skipping 21 matching lines @@
 void DragCaret::paintDragCaret(LocalFrame* frame,
                                GraphicsContext& context,
                                const LayoutPoint& paintOffset) const {
   if (m_position.anchorNode()->document().frame() == frame) {
     m_caretBase->paintCaret(m_position.anchorNode(), context, m_caretLocalRect,
                             paintOffset, DisplayItem::kDragCaret);
   }
 }
 
 }  // namespace blink