Invalidate caret during paint invalidation

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

Index: third_party/WebKit/Source/core/editing/FrameSelection.cpp
diff --git a/third_party/WebKit/Source/core/editing/FrameSelection.cpp b/third_party/WebKit/Source/core/editing/FrameSelection.cpp
index f7678ec27d5ddde784996d432d3b4ee071b2e0c4..dde5845feb0427dd317aa71edb033608871765cc 100644
--- a/third_party/WebKit/Source/core/editing/FrameSelection.cpp
+++ b/third_party/WebKit/Source/core/editing/FrameSelection.cpp
@@ -224,7 +224,7 @@ void FrameSelection::setSelectionAlgorithm(
 
   m_handleVisibility = handleVisibility;
   m_selectionEditor->setVisibleSelection(s, options);
-  m_frameCaret->setCaretRectNeedsUpdate();
+  scheduleVisualUpdateForPaintInvalidationIfNeeded();
 
   if (!s.isNone() && !(options & DoNotSetFocus)) {
     setFocusedNodeIfNeeded();
@@ -239,9 +239,6 @@ void FrameSelection::setSelectionAlgorithm(
   }
 
   if (!(options & DoNotUpdateAppearance)) {
-    // Hits in
-    // compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents.html
-    DisableCompositingQueryAsserts disabler;
     m_frameCaret->stopCaretBlinkTimer();
     updateAppearance();
   }
@@ -386,7 +383,6 @@ void FrameSelection::nodeChildrenWillBeRemoved(ContainerNode& container) {
     m_selectionEditor->setWithoutValidation(newStart, newEnd);
   else
     m_selectionEditor->setWithoutValidation(newEnd, newStart);
-  m_frameCaret->setCaretRectNeedsUpdate();
   if (document().isRunningExecCommand())
     return;
   TypingCommand::closeTyping(m_frame);
@@ -466,7 +462,6 @@ void FrameSelection::respondToNodeModification(Node& node,
 
   if (clearDOMTreeSelection)
     setSelection(SelectionInDOMTree(), DoNotSetFocus);
-  m_frameCaret->setCaretRectNeedsUpdate();
 
   // TODO(yosin): We should move to call |TypingCommand::closeTyping()| to
   // |Editor| class.
@@ -677,7 +672,7 @@ bool FrameSelection::modify(EAlteration alter,
   if (userTriggered == UserTriggered)
     m_granularity = CharacterGranularity;
 
-  m_frameCaret->setCaretRectNeedsUpdate();
+  scheduleVisualUpdateForPaintInvalidationIfNeeded();
 
   return true;
 }
@@ -712,7 +707,6 @@ void FrameSelection::documentAttached(Document* document) {
   DCHECK(document);
   m_useSecureKeyboardEntryWhenActive = false;
   m_selectionEditor->documentAttached(document);
-  m_frameCaret->documentAttached(document);
   setContext(document);
 }
 
@@ -727,26 +721,36 @@ void FrameSelection::contextDestroyed(Document* document) {
   m_selectionEditor->documentDetached(*document);
 }
 
-bool FrameSelection::hasCaretIn(const LayoutBlock& layoubBlock) const {
-  DCHECK(selection().isValidFor(document()));
-  if (!isCaret())
-    return false;
-  return CaretDisplayItemClient::caretLayoutObject(
-             selection().start().anchorNode()) == layoubBlock &&
-         hasEditableStyle();
+void FrameSelection::clearPreviousCaretVisualRect(const LayoutBlock& block) {
+  m_frameCaret->clearPreviousVisualRect(block);
 }
 
-IntRect FrameSelection::absoluteCaretBounds() {
-  DCHECK(selection().isValidFor(*m_frame->document()));
-  return m_frameCaret->absoluteCaretBounds();
+void FrameSelection::layoutBlockWillBeDestroyed(const LayoutBlock& block) {
+  m_frameCaret->layoutBlockWillBeDestroyed(block);
 }
 
-void FrameSelection::invalidateCaretRect(bool forceInvalidation) {
-  m_frameCaret->invalidateCaretRect(forceInvalidation);
+void FrameSelection::updateStyleAndLayoutIfNeeded() {
+  m_frameCaret->updateStyleAndLayoutIfNeeded();
+}
+
+void FrameSelection::invalidatePaintIfNeeded(
+    const LayoutBlock& block,
+    const PaintInvalidatorContext& context,
+    PaintInvalidationReason reason) {
+  m_frameCaret->invalidatePaintIfNeeded(block, context, reason);
+}
+
+bool FrameSelection::shouldPaintCaret(const LayoutBlock& block) const {
+  DCHECK(selection().isValidFor(document()));
+
+  bool result = m_frameCaret->shouldPaintCaret(block);
+  DCHECK(!result || (isCaret() && hasEditableStyle()));
+  return result;
 }
 
-void FrameSelection::dataWillChange(const CharacterData& node) {
-  m_frameCaret->dataWillChange(node);
+IntRect FrameSelection::absoluteCaretBounds() {
+  DCHECK(selection().isValidFor(*m_frame->document()));
+  return m_frameCaret->absoluteCaretBounds();
 }
 
 void FrameSelection::paintCaret(GraphicsContext& context,
@@ -1051,7 +1055,6 @@ void FrameSelection::commitAppearanceIfNeeded(LayoutView& layoutView) {
 }
 
 void FrameSelection::didLayout() {
-  setCaretRectNeedsUpdate();
   updateAppearance();
 }
 
@@ -1311,6 +1314,11 @@ void FrameSelection::scheduleVisualUpdate() const {
     page->animator().scheduleVisualUpdate(m_frame->localFrameRoot());
 }
 
+void FrameSelection::scheduleVisualUpdateForPaintInvalidationIfNeeded() const {
+  if (FrameView* frameView = m_frame->view())
+    frameView->scheduleVisualUpdateForPaintInvalidationIfNeeded();
+}
+
 bool FrameSelection::selectWordAroundPosition(const VisiblePosition& position) {
   static const EWordSide wordSideList[2] = {RightWordIfOnBoundary,
                                             LeftWordIfOnBoundary};
@@ -1400,18 +1408,6 @@ void FrameSelection::setCaretVisible(bool caretIsVisible) {
                                                   : CaretVisibility::Hidden);
 }
 
-bool FrameSelection::shouldPaintCaretForTesting() const {
-  return m_frameCaret->shouldPaintCaretForTesting();
-}
-
-bool FrameSelection::isPreviousCaretDirtyForTesting() const {
-  return m_frameCaret->isPreviousCaretDirtyForTesting();
-}
-
-void FrameSelection::setCaretRectNeedsUpdate() {
-  m_frameCaret->setCaretRectNeedsUpdate();
-}
-
 void FrameSelection::setCaretBlinkingSuspended(bool suspended) {
   m_frameCaret->setCaretBlinkingSuspended(suspended);
 }