Make CaretBase a DisplayItemClient.

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/DragCaretController.h"
 #include "core/editing/FrameSelection.h"
 #include "core/layout/LayoutFlexibleBox.h"
 #include "core/layout/LayoutInline.h"
@@ skipping 176 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.
+    // LOG(ERROR) << "Painting caret [bounds=" << bounds.toString() << ", obj=" << m_layoutBlock.debugName() << "].";

[chrishtr, 2016/09/01 15:00:13]

remove these comments

[wkorman, 2016/09/01 23:40:41]

Done.

+    // m_layoutBlock.showLayoutTreeForThis();
+    // TODO(wkorman): Consider moving recorder into caret, having caret be DisplayItemClient for itself,

[chrishtr, 2016/09/01 15:00:13]

The recorder is already in CaretBase.

[wkorman, 2016/09/01 23:40:40]

Done.

+    // and use logic in invalidateLocalCaretRect() for the caret visual rect.
     if (paintPhase == PaintPhaseForeground && m_layoutBlock.hasCaret())
         paintCarets(paintInfo, paintOffset);
 }
 
 void BlockPainter::paintCarets(const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     LocalFrame* frame = m_layoutBlock.frame();
 
     if (m_layoutBlock.hasCursorCaret())
         frame->selection().paintCaret(paintInfo.context, paintOffset);
@@ skipping 34 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