Move m_caretVisibility from CaretBase to FrameCaret

third_party/WebKit/Source/core/editing/FrameCaret.h

 /*
  * 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 16 matching lines @@
 #define FrameCaret_h
 
 #include "core/CoreExport.h"
 #include "core/editing/CaretBase.h"
 #include "platform/geometry/IntRect.h"
 
 namespace blink {
 
 class SelectionEditor;
 
+enum class CaretVisibility { Visible, Hidden };
+
 class CORE_EXPORT FrameCaret final : public CaretBase {
 public:
     FrameCaret(LocalFrame*, const SelectionEditor&);
     ~FrameCaret() override;
 
     bool isActive() const { return caretPosition().isNotNull(); }
 
     void updateAppearance();
 
     // Used to suspend caret blinking while the mouse is down.
     void setCaretBlinkingSuspended(bool suspended) { m_isCaretBlinkingSuspended = suspended; }
     bool isCaretBlinkingSuspended() const { return m_isCaretBlinkingSuspended; }
     void stopCaretBlinkTimer();
     void startBlinkCaret();
 
-    void setCaretVisibility(CaretVisibility) override;
+    void setCaretVisibility(CaretVisibility);
     bool isCaretBoundsDirty() const { return m_caretRectDirty; }
     void setCaretRectNeedsUpdate();
     // If |forceInvalidation| is true the caret's previous and new rectangles
     // are forcibly invalidated regardless of the state of the blink timer.
     void invalidateCaretRect(bool forceInvalidation);
     IntRect absoluteCaretBounds();
 
     bool shouldShowBlockCursor() const { return m_shouldShowBlockCursor; }
     void setShouldShowBlockCursor(bool);
 
@@ skipping 18 matching lines @@
     bool shouldBlinkCaret() const;
     void caretBlinkTimerFired(TimerBase*);
     bool caretPositionIsValidForDocument(const Document&) const;
 
     const Member<const SelectionEditor> m_selectionEditor;
     const Member<LocalFrame> m_frame;
     // The last node which painted the caret. Retained for clearing the old
     // caret when it moves.
     Member<Node> m_previousCaretNode;
     LayoutRect m_previousCaretRect;
+    CaretVisibility m_caretVisibility;
     CaretVisibility m_previousCaretVisibility;
     Timer<FrameCaret> m_caretBlinkTimer;
     bool m_caretRectDirty : 1;
     bool m_shouldPaintCaret : 1;
     bool m_isCaretBlinkingSuspended : 1;
     bool m_shouldShowBlockCursor : 1;
 };
 
 } // namespace blink
 
 #endif // FrameCaret_h