Move m_caretVisibility from CaretBase to FrameCaret

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 25 matching lines @@
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/page/Page.h"
 #include "core/paint/PaintLayer.h"
 #include "public/platform/WebTraceLocation.h"
 
 namespace blink {
 
 FrameCaret::FrameCaret(LocalFrame* frame, const SelectionEditor& selectionEditor)
     : m_selectionEditor(&selectionEditor)
     , m_frame(frame)
+    , m_caretVisibility(CaretVisibility::Hidden)
     , m_previousCaretVisibility(CaretVisibility::Hidden)
     , m_caretBlinkTimer(this, &FrameCaret::caretBlinkTimerFired)
     , m_caretRectDirty(true)
     , m_shouldPaintCaret(true)
     , m_isCaretBlinkingSuspended(false)
     , m_shouldShowBlockCursor(false)
 {
     DCHECK(frame);
 }
 
@@ skipping 56 matching lines @@
 
     if (double blinkInterval = LayoutTheme::theme().caretBlinkInterval())
         m_caretBlinkTimer.startRepeating(blinkInterval, BLINK_FROM_HERE);
 
     m_shouldPaintCaret = true;
     setCaretRectNeedsUpdate();
 }
 
 void FrameCaret::setCaretVisibility(CaretVisibility visibility)
 {
-    if (getCaretVisibility() == visibility)
+    if (m_caretVisibility == visibility)
         return;
 
-    CaretBase::setCaretVisibility(visibility);
+    m_caretVisibility = visibility;
 
     updateAppearance();
 }
 
 void FrameCaret::setCaretRectNeedsUpdate()
 {
     if (m_caretRectDirty)
         return;
     m_caretRectDirty = true;
 
@@ skipping 26 matching lines @@
     // It's possible for the timer to be inactive even though we want to
     // invalidate the caret. For example, when running as a layout test the
     // caret blink interval could be zero and thus |m_caretBlinkTimer| will
     // never be started. We provide |forceInvalidation| for use by paint
     // invalidation internals where we need to invalidate the caret regardless
     // of timer state.
     if (!forceInvalidation
         && !m_caretBlinkTimer.isActive()
         && newNode == m_previousCaretNode
         && newRect == m_previousCaretRect
-        && getCaretVisibility() == m_previousCaretVisibility)
+        && m_caretVisibility == m_previousCaretVisibility)
         return;
 
     LayoutViewItem view = m_frame->document()->layoutViewItem();
     if (m_previousCaretNode && (shouldRepaintCaret(*m_previousCaretNode) || shouldRepaintCaret(view)))
         invalidateLocalCaretRect(m_previousCaretNode.get(), m_previousCaretRect);
     if (newNode && (shouldRepaintCaret(*newNode) || shouldRepaintCaret(view)))
         invalidateLocalCaretRect(newNode, newRect);
     m_previousCaretNode = newNode;
     m_previousCaretRect = newRect;
-    m_previousCaretVisibility = getCaretVisibility();
+    m_previousCaretVisibility = m_caretVisibility;
 }
 
 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();
@@ skipping 14 matching lines @@
 {
     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().position().anchorNode(), context, paintOffset, DisplayItem::kCaret);
 }
 
 void FrameCaret::dataWillChange(const CharacterData& node)
 {
     if (node == m_previousCaretNode) {
@@ skipping 16 matching lines @@
 }
 
 void FrameCaret::documentDetached()
 {
     m_caretBlinkTimer.stop();
     m_previousCaretNode.clear();
 }
 
 bool FrameCaret::shouldBlinkCaret() const
 {
-    if (!caretIsVisible() || !isActive())
+    if (m_caretVisibility != CaretVisibility::Visible || !isActive())
         return false;
 
     if (m_frame->settings() && m_frame->settings()->caretBrowsingEnabled())
         return false;
 
     Element* root = rootEditableElementOf(caretPosition().position());
     if (!root)
         return false;
 
     Element* focusedElement = root->document().focusedElement();
     if (!focusedElement)
         return false;
 
     return focusedElement->isShadowIncludingInclusiveAncestorOf(caretPosition().position().anchorNode());
 }
 
 void FrameCaret::caretBlinkTimerFired(TimerBase*)
 {
-    DCHECK(caretIsVisible());
+    DCHECK_EQ(m_caretVisibility, CaretVisibility::Visible);
     if (isCaretBlinkingSuspended() && m_shouldPaintCaret)
         return;
     m_shouldPaintCaret = !m_shouldPaintCaret;
     setCaretRectNeedsUpdate();
 }
 
 } // nemaspace blink