CONTINUED Make FrameSelection to hold non-canonicalized positions

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

Index: third_party/WebKit/Source/core/editing/CaretBase.h
diff --git a/third_party/WebKit/Source/core/editing/CaretBase.h b/third_party/WebKit/Source/core/editing/CaretBase.h
index 264bc57b759250fb1efed304628229890ee7b6ff..e1fb281d137c576154238551121c566e9a77a86a 100644
--- a/third_party/WebKit/Source/core/editing/CaretBase.h
+++ b/third_party/WebKit/Source/core/editing/CaretBase.h
@@ -27,7 +27,6 @@
 #ifndef CaretBase_h
 #define CaretBase_h
 
-#include "core/CoreExport.h"
 #include "core/editing/VisiblePosition.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/geometry/LayoutRect.h"
@@ -36,12 +35,10 @@
 
 namespace blink {
 
-class DisplayItemClient;
 class GraphicsContext;
 class LayoutBlock;
 
-class CORE_EXPORT CaretBase : public GarbageCollectedFinalized<CaretBase>,
-                              public DisplayItemClient {
+class CaretBase : public DisplayItemClient {
   WTF_MAKE_NONCOPYABLE(CaretBase);
 
  public:
@@ -54,23 +51,11 @@ class CORE_EXPORT CaretBase : public GarbageCollectedFinalized<CaretBase>,
   // A position in HTMLTextFromControlElement is a typical example.
   static LayoutRect computeCaretRect(const PositionWithAffinity& caretPosition);
 
-  // TODO(yosin): We should move |computeCaretRect()| with |VisiblePosition| to
-  // "FrameCaret.cpp" as static file local function.
-  static LayoutRect computeCaretRect(const VisiblePosition& caretPosition);
-
-  // TODO(yosin): We should move |absoluteBoundsForLocalRect()| with
-  // |VisiblePosition| to "FrameCaret.cpp" as static file local function.
-  IntRect absoluteBoundsForLocalRect(Node*, const LayoutRect&) const;
-
-  // TODO(yosin): We should move |shouldRepaintCaret()| to "FrameCaret.cpp" as
-  // static file local function.
-  bool shouldRepaintCaret(Node&) const;
-  static void paintCaret(Node*,
-                         GraphicsContext&,
-                         const DisplayItemClient&,
-                         const LayoutRect& caretLocalRect,
-                         const LayoutPoint&,
-                         DisplayItem::Type);
+  void paintCaret(Node*,
+                  GraphicsContext&,
+                  const LayoutRect& caretLocalRect,
+                  const LayoutPoint&,
+                  DisplayItem::Type);
 
   static LayoutBlock* caretLayoutObject(Node*);
   void invalidateLocalCaretRect(Node*, const LayoutRect&);
@@ -79,8 +64,6 @@ class CORE_EXPORT CaretBase : public GarbageCollectedFinalized<CaretBase>,
   LayoutRect visualRect() const override;
   String debugName() const final;
 
-  DECLARE_VIRTUAL_TRACE();
-
  private:
   LayoutRect m_visualRect;
 };