Move m_caretVisibility from CaretBase to FrameCaret

third_party/WebKit/Source/core/editing/CaretBase.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 24 matching lines @@
 #include "core/layout/api/LayoutItem.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/paint/PaintInfo.h"
 #include "core/paint/PaintLayer.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
 
 namespace blink {
 
-CaretBase::CaretBase(CaretVisibility visibility)
-    : m_caretVisibility(visibility)
-{
-}
-
+CaretBase::CaretBase() = default;
 CaretBase::~CaretBase() = default;
 
 DEFINE_TRACE(CaretBase)
 {
 }
 
 void CaretBase::clearCaretRect()
 {
     m_caretLocalRect = LayoutRect();
 }
@@ skipping 126 matching lines @@
 {
     if (LayoutViewItem view = node->document().layoutViewItem()) {
         node->document().updateStyleAndLayoutTree();
         if (hasEditableStyle(*node) || shouldRepaintCaret(view))
             invalidateLocalCaretRect(node, localCaretRectWithoutUpdate());
     }
 }
 
 void CaretBase::paintCaret(Node* node, GraphicsContext& context, const LayoutPoint& paintOffset, DisplayItem::Type displayItemType) const
 {
-    if (m_caretVisibility == CaretVisibility::Hidden)
-        return;
-
     if (DrawingRecorder::useCachedDrawingIfPossible(context, *this, displayItemType))
         return;
 
     LayoutRect drawingRect = localCaretRectWithoutUpdate();
     if (LayoutBlock* layoutObject = caretLayoutObject(node))
         layoutObject->flipForWritingMode(drawingRect);
     drawingRect.moveBy(roundedIntPoint(paintOffset));
 
     Color caretColor = Color::black;
 
     Element* element;
     if (node->isElementNode())
         element = toElement(node);
     else
         element = node->parentElement();
 
     if (element && element->layoutObject())
         caretColor = element->layoutObject()->resolveColor(CSSPropertyColor);
 
     IntRect paintRect = pixelSnappedIntRect(drawingRect);
     DrawingRecorder drawingRecorder(context, *this, DisplayItem::kCaret, paintRect);
     context.fillRect(paintRect, caretColor);
 }
 
-void CaretBase::setCaretVisibility(CaretVisibility visibility)
-{
-    m_caretVisibility = visibility;
-}
-
 String CaretBase::debugName() const
 {
     return "Caret";
 }
 
 LayoutRect CaretBase::visualRect() const
 {
     return m_visualRect;
 }
 
 } // namespace blink