Get rid of CaretBase::m_caretLocalRect

third_party/WebKit/Source/core/editing/DragCaretController.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 43 matching lines @@
 }
 
 void DragCaretController::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())
-    m_caretBase->invalidateCaretRect(node);
+    m_caretBase->invalidateCaretRect(node, m_caretLocalRect);
   m_position = createVisiblePosition(position).toPositionWithAffinity();
   Document* document = nullptr;
   if (Node* node = m_position.anchorNode()) {
-    m_caretBase->invalidateCaretRect(node);
+    m_caretBase->invalidateCaretRect(node, m_caretLocalRect);
     document = &node->document();
     setContext(document);
   }
   if (m_position.isNull()) {
-    m_caretBase->clearCaretRect();
+    m_caretLocalRect = LayoutRect();
   } else {
     DCHECK(!m_position.isOrphan());
     document->updateStyleAndLayoutTree();
-    m_caretBase->updateCaretRect(m_position);
+    m_caretLocalRect = CaretBase::computeCaretRect(m_position);
   }
 }
 
 void DragCaretController::nodeChildrenWillBeRemoved(ContainerNode& container) {
   if (!hasCaret() || !container.inActiveDocument())
     return;
   Node* const anchorNode = m_position.position().anchorNode();
   if (!anchorNode || anchorNode == container)
     return;
   if (!container.isShadowIncludingInclusiveAncestorOf(anchorNode))
@@ skipping 17 matching lines @@
 DEFINE_TRACE(DragCaretController) {
   visitor->trace(m_position);
   visitor->trace(m_caretBase);
   SynchronousMutationObserver::trace(visitor);
 }
 
 void DragCaretController::paintDragCaret(LocalFrame* frame,
                                          GraphicsContext& context,
                                          const LayoutPoint& paintOffset) const {
   if (m_position.anchorNode()->document().frame() == frame) {
-    m_caretBase->paintCaret(m_position.anchorNode(), context, paintOffset,
-                            DisplayItem::kDragCaret);
+    CaretBase::paintCaret(m_position.anchorNode(), context, *m_caretBase,
+                          m_caretLocalRect, paintOffset,
+                          DisplayItem::kDragCaret);
   }
 }
 
 }  // namespace blink