Get rid of CaretBase::m_caretLocalRect

third_party/WebKit/Source/core/editing/FrameCaret.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 191 matching lines @@
                              m_previousCaretRect);
   }
   if (newAnchorNode && shouldRepaintCaret(*newAnchorNode))
     invalidateLocalCaretRect(newAnchorNode, newRect);
   m_previousCaretNode = newNode;
   m_previousCaretAnchorNode = newAnchorNode;
   m_previousCaretRect = newRect;
   m_previousCaretVisibility = m_caretVisibility;
 }
 
+// TDOO(yosin): We should mark |FrameCaret::absoluteCaretBounds()| to |const|.
 IntRect FrameCaret::absoluteCaretBounds() {
   DCHECK_NE(m_frame->document()->lifecycle().state(),
             DocumentLifecycle::InPaintInvalidation);
   DCHECK(!m_frame->document()->needsLayoutTreeUpdate());
   DocumentLifecycle::DisallowTransitionScope disallowTransition(
       m_frame->document()->lifecycle());
 
-  if (!isActive()) {
-    clearCaretRect();
-  } else {
-    if (enclosingTextControl(caretPosition().position())) {
-      if (isVisuallyEquivalentCandidate(caretPosition().position()))
-        updateCaretRect(caretPosition());
-      else
-        updateCaretRect(createVisiblePosition(caretPosition()));
-    } else {
-      updateCaretRect(createVisiblePosition(caretPosition()));
-    }
+  Node* const caretNode = caretPosition().anchorNode();
+  if (!isActive())
+    return absoluteBoundsForLocalRect(caretNode, LayoutRect());
+  // TODO(yosin): We should get rid of text control short path since layout
+  // tree is clean.
+  if (enclosingTextControl(caretPosition().position()) &&
+      isVisuallyEquivalentCandidate(caretPosition().position())) {
+    return absoluteBoundsForLocalRect(caretNode,
+                                      computeCaretRect(caretPosition()));
   }
-  return absoluteBoundsForLocalRect(caretPosition().anchorNode(),
-                                    localCaretRectWithoutUpdate());
+  return absoluteBoundsForLocalRect(
+      caretNode, computeCaretRect(createVisiblePosition(caretPosition())));
 }
 
 void FrameCaret::setShouldShowBlockCursor(bool shouldShowBlockCursor) {
   m_shouldShowBlockCursor = shouldShowBlockCursor;
 
   m_frame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
   updateAppearance();
 }
 
 void FrameCaret::paintCaret(GraphicsContext& context,
                             const LayoutPoint& paintOffset) {
   if (m_caretVisibility == CaretVisibility::Hidden)
     return;
 
   if (!(isActive() && m_shouldPaintCaret))
     return;
 
-  updateCaretRect(caretPosition());
-  CaretBase::paintCaret(caretPosition().anchorNode(), context, paintOffset,
-                        DisplayItem::kCaret);
+  const LayoutRect caretLocalRect = computeCaretRect(caretPosition());
+  CaretBase::paintCaret(caretPosition().anchorNode(), context, *this,
+                        caretLocalRect, paintOffset, DisplayItem::kCaret);
 }
 
 void FrameCaret::dataWillChange(const CharacterData& node) {
   if (node == m_previousCaretNode) {
     // This invalidation is eager, and intentionally uses stale state.
     DisableCompositingQueryAsserts disabler;
     invalidateLocalCaretRect(m_previousCaretAnchorNode.get(),
                              m_previousCaretRect);
   }
 }
@@ skipping 35 matching lines @@
 
 void FrameCaret::caretBlinkTimerFired(TimerBase*) {
   DCHECK_EQ(m_caretVisibility, CaretVisibility::Visible);
   if (isCaretBlinkingSuspended() && m_shouldPaintCaret)
     return;
   m_shouldPaintCaret = !m_shouldPaintCaret;
   setCaretRectNeedsUpdate();
 }
 
 }  // namespace blink