ALL-IN-ONE Introduce enum class TextAffinity

Source/core/editing/VisiblePosition.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Portions Copyright (c) 2011 Motorola Mobility, 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
@@ skipping 15 matching lines @@
 
 #include "config.h"
 #include "core/editing/VisiblePosition.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/HTMLNames.h"
 #include "core/dom/Document.h"
 #include "core/dom/Range.h"
 #include "core/dom/Text.h"
 #include "core/editing/EditingUtilities.h"
+#include "core/editing/TextAffinity.h"
 #include "core/editing/VisibleUnits.h"
 #include "core/html/HTMLElement.h"
 #include "core/layout/LayoutBlock.h"
 #include "core/layout/line/RootInlineBox.h"
 #include "platform/geometry/FloatQuad.h"
 #include "wtf/text/CString.h"
 
 #ifndef NDEBUG
 #include <stdio.h>
 #endif
 
 namespace blink {
 
 using namespace HTMLNames;
 
-VisiblePosition::VisiblePosition(const Position &pos, EAffinity affinity)
+VisiblePosition::VisiblePosition(const Position &pos, TextAffinity affinity)
 {
     init(pos, affinity);
 }
 
-VisiblePosition::VisiblePosition(const PositionInComposedTree& pos, EAffinity affinity)
+VisiblePosition::VisiblePosition(const PositionInComposedTree& pos, TextAffinity affinity)
 {
     init(pos, affinity);
 }
 
 VisiblePosition::VisiblePosition(const PositionWithAffinity& positionWithAffinity)
 {
     init(positionWithAffinity.position(), positionWithAffinity.affinity());
 }
 
 VisiblePosition VisiblePosition::next(EditingBoundaryCrossingRule rule) const
@@ skipping 17 matching lines @@
     Position pos = previousVisuallyDistinctCandidate(m_deepPosition);
 
     // return null visible position if there is no previous visible position
     if (pos.atStartOfTree())
         return VisiblePosition();
 
     VisiblePosition prev = VisiblePosition(pos);
     ASSERT(prev.deepEquivalent() != m_deepPosition);
 
 #if ENABLE(ASSERT)
-    // we should always be able to make the affinity DOWNSTREAM, because going previous from an
-    // UPSTREAM position can never yield another UPSTREAM position (unless line wrap length is 0!).
-    if (prev.isNotNull() && m_affinity == UPSTREAM) {
-        ASSERT(inSameLine(PositionWithAffinity(prev.deepEquivalent()), PositionWithAffinity(prev.deepEquivalent(), UPSTREAM)));
+    // we should always be able to make the affinity |TextAffinity::Downstream|,
+    // because going previous from an |TextAffinity::Upstream| position can
+    // never yield another |TextAffinity::Upstream position| (unless line wrap
+    // length is 0!).
+    if (prev.isNotNull() && m_affinity == TextAffinity::Upstream) {
+        ASSERT(inSameLine(PositionWithAffinity(prev.deepEquivalent()), PositionWithAffinity(prev.deepEquivalent(), TextAffinity::Upstream)));
     }
 #endif
 
     switch (rule) {
     case CanCrossEditingBoundary:
         return prev;
     case CannotCrossEditingBoundary:
         return honorEditingBoundaryAtOrBefore(prev);
     case CanSkipOverEditingBoundary:
         return skipToStartOfEditingBoundary(prev);
@@ skipping 521 matching lines @@
 {
     return canonicalPosition(position);
 }
 
 PositionInComposedTree canonicalPositionOf(const PositionInComposedTree& position)
 {
     return canonicalPosition(position);
 }
 
 template<typename Strategy>
-void VisiblePosition::init(const PositionAlgorithm<Strategy>& position, EAffinity affinity)
+void VisiblePosition::init(const PositionAlgorithm<Strategy>& position, TextAffinity affinity)
 {
     m_affinity = affinity;
 
     PositionAlgorithm<Strategy> deepPosition = canonicalPosition(position);
     m_deepPosition = toPositionInDOMTree(deepPosition);
 
-    if (m_affinity != UPSTREAM)
+    if (m_affinity != TextAffinity::Upstream)
         return;
 
     if (isNull()) {
-        m_affinity = DOWNSTREAM;
+        m_affinity = TextAffinity::Downstream;
         return;
     }
 
-    // When not at a line wrap, make sure to end up with DOWNSTREAM affinity.
-    if (!inSameLine(PositionWithAffinityTemplate<Strategy>(deepPosition), PositionWithAffinityTemplate<Strategy>(deepPosition, UPSTREAM)))
+    // When not at a line wrap, make sure to end up with
+    // |TextAffinity::Downstream| affinity.
+    if (!inSameLine(PositionWithAffinityTemplate<Strategy>(deepPosition), PositionWithAffinityTemplate<Strategy>(deepPosition, TextAffinity::Upstream)))
         return;
-    m_affinity = DOWNSTREAM;
+    m_affinity = TextAffinity::Downstream;
 }
 
 UChar32 VisiblePosition::characterAfter() const
 {
     // We canonicalize to the first of two equivalent candidates, but the second
     // of the two candidates is the one that will be inside the text node
     // containing the character after this visible position.
     Position pos = m_deepPosition.downstream();
     if (!pos.isOffsetInAnchor())
         return 0;
@@ skipping 97 matching lines @@
     else
         fprintf(stderr, "Cannot showTree for (nil) VisiblePosition.\n");
 }
 
 void showTree(const blink::VisiblePosition& vpos)
 {
     vpos.showTreeForThis();
 }
 
 #endif