ALL-IN-ONE Introduce enum class TextAffinity

Source/core/editing/VisibleSelection.h

 /*
  * Copyright (C) 2004 Apple Computer, 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 12 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef VisibleSelection_h
 #define VisibleSelection_h
 
 #include "core/CoreExport.h"
 #include "core/editing/EditingStrategy.h"
 #include "core/editing/EphemeralRange.h"
 #include "core/editing/SelectionType.h"
+#include "core/editing/TextAffinity.h"
 #include "core/editing/TextGranularity.h"
 #include "core/editing/VisiblePosition.h"
 #include "core/editing/VisibleUnits.h"
 
 namespace blink {
 
 class LayoutPoint;
 
 // TODO(yosin) We should use capitalized name instead of |SEL_DEFAULT_AFFINITY|.
-const EAffinity SEL_DEFAULT_AFFINITY = DOWNSTREAM; // NOLINT
+const TextAffinity SEL_DEFAULT_AFFINITY = TextAffinity::Downstream; // NOLINT
 enum SelectionDirection { DirectionForward, DirectionBackward, DirectionRight, DirectionLeft };
 
 class CORE_EXPORT VisibleSelection {
     DISALLOW_ALLOCATION();
     DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(VisibleSelection);
 public:
     class InDOMTree {
     public:
         using PositionType = Position;
         using Strategy = EditingStrategy;
@@ skipping 18 matching lines @@
         static EphemeralRangeInComposedTree asRange(const VisibleSelection&);
         static bool equalSelections(const VisibleSelection&, const VisibleSelection&);
         static bool isRange(const VisibleSelection& selection) { return selectionType(selection) == RangeSelection; }
         static PositionType selectionBase(const VisibleSelection& selection) { return selection.baseInComposedTree(); }
         static PositionType selectionExtent(const VisibleSelection& selection) { return selection.extentInComposedTree(); }
         static PositionType selectionStart(const VisibleSelection& selection) { return selection.startInComposedTree(); }
         static PositionType selectionEnd(const VisibleSelection& selection) { return selection.endInComposedTree(); }
         static SelectionType selectionType(const VisibleSelection& selection) { return selection.selectionTypeInComposedTree(); }
         static VisiblePosition selectionVisibleStart(const VisibleSelection& selection)
         {
-            return VisiblePosition(selectionStart(selection), isRange(selection) ? DOWNSTREAM : selection.affinity());
+            return VisiblePosition(selectionStart(selection), isRange(selection) ? TextAffinity::Downstream : selection.affinity());
         }
         static VisiblePosition selectionVisibleEnd(const VisibleSelection& selection)
         {
-            return VisiblePosition(selectionEnd(selection), isRange(selection) ? UPSTREAM : selection.affinity());
+            return VisiblePosition(selectionEnd(selection), isRange(selection) ? TextAffinity::Upstream : selection.affinity());
         }
         static PositionType toPositionType(const Position& position) { return toPositionInComposedTree(position); }
     };
 
     VisibleSelection();
 
-    VisibleSelection(const Position&, EAffinity, bool isDirectional = false);
-    VisibleSelection(const Position& base, const Position& extent, EAffinity = SEL_DEFAULT_AFFINITY, bool isDirectional = false);
-    VisibleSelection(const PositionInComposedTree& base, const PositionInComposedTree& extent, EAffinity = SEL_DEFAULT_AFFINITY, bool isDirectional = false);
+    VisibleSelection(const Position&, TextAffinity, bool isDirectional = false);
+    VisibleSelection(const Position& base, const Position& extent, TextAffinity = SEL_DEFAULT_AFFINITY, bool isDirectional = false);
+    VisibleSelection(const PositionInComposedTree& base, const PositionInComposedTree& extent, TextAffinity = SEL_DEFAULT_AFFINITY, bool isDirectional = false);
 
-    explicit VisibleSelection(const EphemeralRange&, EAffinity = SEL_DEFAULT_AFFINITY, bool isDirectional = false);
-    explicit VisibleSelection(const Range*, EAffinity = SEL_DEFAULT_AFFINITY, bool isDirectional = false);
+    explicit VisibleSelection(const EphemeralRange&, TextAffinity = SEL_DEFAULT_AFFINITY, bool isDirectional = false);
+    explicit VisibleSelection(const Range*, TextAffinity = SEL_DEFAULT_AFFINITY, bool isDirectional = false);
 
     explicit VisibleSelection(const VisiblePosition&, bool isDirectional = false);
     VisibleSelection(const VisiblePosition&, const VisiblePosition&, bool isDirectional = false);
 
     VisibleSelection(const VisibleSelection&);
     VisibleSelection& operator=(const VisibleSelection&);
 
     static VisibleSelection selectionFromContentsOfNode(Node*);
 
     SelectionType selectionType() const { return m_selectionType; }
     SelectionType selectionTypeInComposedTree() const;
 
-    void setAffinity(EAffinity affinity) { m_affinity = affinity; }
-    EAffinity affinity() const { return m_affinity; }
+    void setAffinity(TextAffinity affinity) { m_affinity = affinity; }
+    TextAffinity affinity() const { return m_affinity; }
 
     void setBase(const Position&);
     void setBase(const PositionInComposedTree&);
     void setBase(const VisiblePosition&);
     void setExtent(const Position&);
     void setExtent(const PositionInComposedTree&);
     void setExtent(const VisiblePosition&);
 
     Position base() const { return m_base; }
     Position extent() const { return m_extent; }
     Position start() const { return m_start; }
     Position end() const { return m_end; }
     PositionInComposedTree baseInComposedTree() const;
     PositionInComposedTree extentInComposedTree() const;
     PositionInComposedTree startInComposedTree() const;
     PositionInComposedTree endInComposedTree() const;
 
-    VisiblePosition visibleStart() const { return VisiblePosition(m_start, isRange() ? DOWNSTREAM : affinity()); }
-    VisiblePosition visibleEnd() const { return VisiblePosition(m_end, isRange() ? UPSTREAM : affinity()); }
-    VisiblePosition visibleBase() const { return VisiblePosition(m_base, isRange() ? (isBaseFirst() ? UPSTREAM : DOWNSTREAM) : affinity()); }
-    VisiblePosition visibleExtent() const { return VisiblePosition(m_extent, isRange() ? (isBaseFirst() ? DOWNSTREAM : UPSTREAM) : affinity()); }
+    VisiblePosition visibleStart() const { return VisiblePosition(m_start, isRange() ? TextAffinity::Downstream : affinity()); }
+    VisiblePosition visibleEnd() const { return VisiblePosition(m_end, isRange() ? TextAffinity::Upstream : affinity()); }
+    VisiblePosition visibleBase() const { return VisiblePosition(m_base, isRange() ? (isBaseFirst() ? TextAffinity::Upstream : TextAffinity::Downstream) : affinity()); }
+    VisiblePosition visibleExtent() const { return VisiblePosition(m_extent, isRange() ? (isBaseFirst() ? TextAffinity::Downstream : TextAffinity::Upstream) : affinity()); }
 
     bool isNone() const { return selectionType() == NoSelection; }
     bool isCaret() const { return selectionType() == CaretSelection; }
     bool isRange() const { return selectionType() == RangeSelection; }
     bool isCaretOrRange() const { return selectionType() != NoSelection; }
     bool isNonOrphanedRange() const { return isRange() && !start().isOrphan() && !end().isOrphan(); }
     bool isNonOrphanedCaretOrRange() const { return isCaretOrRange() && !start().isOrphan() && !end().isOrphan(); }
     static SelectionType selectionType(const Position& start, const Position& end);
     static SelectionType selectionType(const PositionInComposedTree& start, const PositionInComposedTree& end);
 
@@ skipping 92 matching lines @@
     // computed from the respective positions at validate(). To have selections
     // work on the composed tree more accurately, we need to compute the DOM
     // positions from the composed tree positions. To do this, we need to add
     // considable amount of fixes (including EditingUtilities.cpp,
     // VisibleUnit.cpp, and VisiblePosition.cpp). We'll do that in the future.
     PositionInComposedTree m_baseInComposedTree;
     PositionInComposedTree m_extentInComposedTree;
     PositionInComposedTree m_startInComposedTree;
     PositionInComposedTree m_endInComposedTree;
 
-    EAffinity m_affinity; // the upstream/downstream affinity of the caret
+    TextAffinity m_affinity; // the upstream/downstream affinity of the caret
 
     // Oilpan: this reference has a lifetime that is at least as long
     // as this object.
     RawPtrWillBeMember<ChangeObserver> m_changeObserver;
 
     // these are cached, can be recalculated by validate()
     SelectionType m_selectionType; // None, Caret, Range
     bool m_baseIsFirst : 1; // True if base is before the extent
     bool m_isDirectional : 1; // Non-directional ignores m_baseIsFirst and selection always extends on shift + arrow key.
 };
 
 } // namespace blink
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showTree(const blink::VisibleSelection&);
 void showTree(const blink::VisibleSelection*);
 #endif
 
 #endif // VisibleSelection_h