Invalidate caret during paint invalidation

third_party/WebKit/Source/core/paint/BlockPainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/paint/BlockPainter.h"
 
 #include "core/editing/DragCaret.h"
 #include "core/editing/FrameSelection.h"
 #include "core/layout/LayoutFlexibleBox.h"
 #include "core/layout/LayoutInline.h"
@@ skipping 25 matching lines @@
     return;
 
   PaintInfo localPaintInfo(paintInfo);
   PaintPhase originalPhase = localPaintInfo.phase;
 
   // There are some cases where not all clipped visual overflow is accounted
   // for.
   // FIXME: reduce the number of such cases.
   ContentsClipBehavior contentsClipBehavior = ForceContentsClip;
   if (m_layoutBlock.shouldClipOverflow() && !m_layoutBlock.hasControlClip() &&
-      !m_layoutBlock.hasCaret())
+      !m_layoutBlock.shouldPaintCarets())
     contentsClipBehavior = SkipContentsClipIfPossible;
 
   if (originalPhase == PaintPhaseOutline) {
     localPaintInfo.phase = PaintPhaseDescendantOutlinesOnly;
   } else if (shouldPaintSelfBlockBackground(originalPhase)) {
     localPaintInfo.phase = PaintPhaseSelfBlockBackgroundOnly;
     m_layoutBlock.paintObject(localPaintInfo, adjustedPaintOffset);
     if (shouldPaintDescendantBlockBackgrounds(originalPhase))
       localPaintInfo.phase = PaintPhaseDescendantBlockBackgroundsOnly;
   }
@@ skipping 182 matching lines @@
     } else {
       paintContents(contentsPaintInfo, paintOffset);
     }
   }
 
   if (shouldPaintSelfOutline(paintPhase))
     ObjectPainter(m_layoutBlock).paintOutline(paintInfo, paintOffset);
 
   // If the caret's node's layout object's containing block is this block, and
   // the paint action is PaintPhaseForeground, then paint the caret.
-  if (paintPhase == PaintPhaseForeground && m_layoutBlock.hasCaret())
+  if (paintPhase == PaintPhaseForeground && m_layoutBlock.shouldPaintCarets())
     paintCarets(paintInfo, paintOffset);
 }
 
 void BlockPainter::paintCarets(const PaintInfo& paintInfo,
                                const LayoutPoint& paintOffset) {
   LocalFrame* frame = m_layoutBlock.frame();
 
-  if (m_layoutBlock.hasCursorCaret())
+  if (m_layoutBlock.shouldPaintCursorCaret())
     frame->selection().paintCaret(paintInfo.context, paintOffset);
 
-  if (m_layoutBlock.hasDragCaret()) {
+  if (m_layoutBlock.shouldPaintDragCaret()) {
     frame->page()->dragCaret().paintDragCaret(frame, paintInfo.context,
                                               paintOffset);
   }
 }
 
 DISABLE_CFI_PERF
 bool BlockPainter::intersectsPaintRect(
     const PaintInfo& paintInfo,
     const LayoutPoint& adjustedPaintOffset) const {
   LayoutRect overflowRect;
@@ skipping 30 matching lines @@
 }
 
 void BlockPainter::paintContents(const PaintInfo& paintInfo,
                                  const LayoutPoint& paintOffset) {
   DCHECK(!m_layoutBlock.childrenInline());
   PaintInfo paintInfoForDescendants = paintInfo.forDescendants();
   m_layoutBlock.paintChildren(paintInfoForDescendants, paintOffset);
 }
 
 }  // namespace blink