[CodeHealth] Use PositionStrategy<Strategy> instead of using ::PositionType

Source/core/dom/Position.h

 /*
  * Copyright (C) 2004, 2006, 2008 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 39 matching lines @@
 enum PositionMoveType {
     CodePoint,       // Move by a single code point.
     Character,       // Move to the next Unicode character break.
     BackwardDeletion // Subject to platform conventions.
 };
 
 template <typename Strategy>
 class CORE_TEMPLATE_CLASS_EXPORT PositionAlgorithm {
     DISALLOW_ALLOCATION();
 public:
-    using PositionType = typename Strategy::PositionType;
     using StrategyType = Strategy;
 
     enum AnchorType : unsigned char {
         PositionIsOffsetInAnchor,
         PositionIsBeforeAnchor,
         PositionIsAfterAnchor,
         PositionIsBeforeChildren,
         PositionIsAfterChildren,
     };
 
     PositionAlgorithm()
         : m_offset(0)
         , m_anchorType(PositionIsOffsetInAnchor)
         , m_isLegacyEditingPosition(false)
     {
     }
 
     // For creating legacy editing positions: (Anchor type will be determined from editingIgnoresContent(node))
     class LegacyEditingOffset {
     public:
         int value() const { return m_offset; }
 
         explicit LegacyEditingOffset(int offset) : m_offset(offset) { }
 
     private:
         int m_offset;
     };
 
-    static const TreeScope* commonAncestorTreeScope(const PositionType&, const PositionType& b);
-    static PositionType createLegacyEditingPosition(PassRefPtrWillBeRawPtr<Node> anchorNode, int offset);
+    static const TreeScope* commonAncestorTreeScope(const PositionAlgorithm<Strategy>&, const PositionAlgorithm<Strategy>& b);
+    static PositionAlgorithm<Strategy> createLegacyEditingPosition(PassRefPtrWillBeRawPtr<Node> anchorNode, int offset);
 
     PositionAlgorithm(PassRefPtrWillBeRawPtr<Node> anchorNode, LegacyEditingOffset);
 
     // For creating before/after positions:
     PositionAlgorithm(PassRefPtrWillBeRawPtr<Node> anchorNode, AnchorType);
     PositionAlgorithm(PassRefPtrWillBeRawPtr<Text> textNode, unsigned offset);
 
     // For creating offset positions:
     // FIXME: This constructor should eventually go away. See bug 63040.
     PositionAlgorithm(PassRefPtrWillBeRawPtr<Node> anchorNode, int offset, AnchorType);
 
     PositionAlgorithm(const PositionAlgorithm&);
 
     AnchorType anchorType() const { return m_anchorType; }
 
     void clear() { m_anchorNode.clear(); m_offset = 0; m_anchorType = PositionIsOffsetInAnchor; m_isLegacyEditingPosition = false; }
 
     // These are always DOM compliant values.  Editing positions like [img, 0] (aka [img, before])
     // will return img->parentNode() and img->nodeIndex() from these functions.
     Node* containerNode() const; // NULL for a before/after position anchored to a node with no parent
     Text* containerText() const;
 
     int computeOffsetInContainerNode() const;  // O(n) for before/after-anchored positions, O(1) for parent-anchored positions
-    PositionType parentAnchoredEquivalent() const; // Convenience method for DOM positions that also fixes up some positions for editing
+    PositionAlgorithm<Strategy> parentAnchoredEquivalent() const; // Convenience method for DOM positions that also fixes up some positions for editing
 
     // Returns |PositionIsAnchor| type |Position| which is compatible with
     // |RangeBoundaryPoint| as safe to pass |Range| constructor. Return value
     // of this function is different from |parentAnchoredEquivalent()| which
     // returns editing specific position.
-    PositionType toOffsetInAnchor() const;
+    PositionAlgorithm<Strategy> toOffsetInAnchor() const;
 
     // Inline O(1) access for Positions which callers know to be parent-anchored
     int offsetInContainerNode() const
     {
         ASSERT(anchorType() == PositionIsOffsetInAnchor);
         return m_offset;
     }
 
     // New code should not use this function.
     int deprecatedEditingOffset() const
@@ skipping 13 matching lines @@
 
     // Similar to |nodeAsRangeLastNode()|, but returns a node in a range.
     Node* nodeAsRangeLastNode() const;
 
     // Returns a node as past last as same as |Range::pastLastNode()|. This
     // function is supposed to used in HTML serialization and plain text
     // iterator. This position must be a |PositionIs::OffsetInAhcor| to
     // behave as |Range| boundary point.
     Node* nodeAsRangePastLastNode() const;
 
-    Node* commonAncestorContainer(const PositionType&) const;
+    Node* commonAncestorContainer(const PositionAlgorithm<Strategy>&) const;
 
     Node* anchorNode() const { return m_anchorNode.get(); }
 
     // FIXME: Callers should be moved off of node(), node() is not always the container for this position.
     // For nodes which editingIgnoresContent(node()) returns true, positions like [ignoredNode, 0]
     // will be treated as before ignoredNode (thus node() is really after the position, not containing it).
     Node* deprecatedNode() const { return m_anchorNode.get(); }
 
     Document* document() const { return m_anchorNode ? &m_anchorNode->document() : 0; }
     bool inDocument() const { return m_anchorNode && m_anchorNode->inDocument(); }
@@ skipping 11 matching lines @@
     bool isNull() const { return !m_anchorNode; }
     bool isNotNull() const { return m_anchorNode; }
     bool isOrphan() const { return m_anchorNode && !m_anchorNode->inDocument(); }
 
     Element* element() const;
     PassRefPtrWillBeRawPtr<CSSComputedStyleDeclaration> ensureComputedStyle() const;
 
     // Move up or down the DOM by one position.
     // Offsets are computed using layout text for nodes that have layoutObjects - but note that even when
     // using composed characters, the result may be inside a single user-visible character if a ligature is formed.
-    PositionType previous(PositionMoveType = CodePoint) const;
-    PositionType next(PositionMoveType = CodePoint) const;
+    PositionAlgorithm<Strategy> previous(PositionMoveType = CodePoint) const;
+    PositionAlgorithm<Strategy> next(PositionMoveType = CodePoint) const;
     static int uncheckedPreviousOffset(const Node*, int current);
     static int uncheckedPreviousOffsetForBackwardDeletion(const Node*, int current);
     static int uncheckedNextOffset(const Node*, int current);
 
-    int compareTo(const PositionType&) const;
+    int compareTo(const PositionAlgorithm<Strategy>&) const;
 
     // These can be either inside or just before/after the node, depending on
     // if the node is ignored by editing or not.
     // FIXME: These should go away. They only make sense for legacy positions.
     bool atFirstEditingPositionForNode() const;
     bool atLastEditingPositionForNode() const;
 
     // Returns true if the visually equivalent positions around have different editability
     bool atEditingBoundary() const;
     Node* parentEditingBoundary() const;
 
     bool atStartOfTree() const;
     bool atEndOfTree() const;
 
     // These return useful visually equivalent positions.
-    PositionType upstream(EditingBoundaryCrossingRule = CannotCrossEditingBoundary) const;
-    PositionType downstream(EditingBoundaryCrossingRule = CannotCrossEditingBoundary) const;
+    PositionAlgorithm<Strategy> upstream(EditingBoundaryCrossingRule = CannotCrossEditingBoundary) const;
+    PositionAlgorithm<Strategy> downstream(EditingBoundaryCrossingRule = CannotCrossEditingBoundary) const;
 
     bool isCandidate() const;
     bool inRenderedText() const;
     bool isRenderedCharacter() const;
-    bool rendersInDifferentPosition(const PositionType&) const;
+    bool rendersInDifferentPosition(const PositionAlgorithm<Strategy>&) const;
 
     void getInlineBoxAndOffset(EAffinity, InlineBox*&, int& caretOffset) const;
     void getInlineBoxAndOffset(EAffinity, TextDirection primaryDirection, InlineBox*&, int& caretOffset) const;
 
     TextDirection primaryDirection() const;
 
     static bool hasRenderedNonAnonymousDescendantsWithHeight(LayoutObject*);
     static bool nodeIsUserSelectNone(Node*);
     static bool nodeIsUserSelectAll(const Node*);
     static Node* rootUserSelectAllForNode(Node*);
-    static PositionType beforeNode(Node* anchorNode);
-    static PositionType afterNode(Node* anchorNode);
-    static PositionType inParentBeforeNode(const Node& anchorNode);
-    static PositionType inParentAfterNode(const Node& anchorNode);
+    static PositionAlgorithm<Strategy> beforeNode(Node* anchorNode);
+    static PositionAlgorithm<Strategy> afterNode(Node* anchorNode);
+    static PositionAlgorithm<Strategy> inParentBeforeNode(const Node& anchorNode);
+    static PositionAlgorithm<Strategy> inParentAfterNode(const Node& anchorNode);
     static int lastOffsetInNode(Node* anchorNode);
-    static PositionType firstPositionInNode(Node* anchorNode);
-    static PositionType lastPositionInNode(Node* anchorNode);
+    static PositionAlgorithm<Strategy> firstPositionInNode(Node* anchorNode);
+    static PositionAlgorithm<Strategy> lastPositionInNode(Node* anchorNode);
     static int minOffsetForNode(Node* anchorNode, int offset);
     static bool offsetIsBeforeLastNodeOffset(int offset, Node* anchorNode);
-    static PositionType firstPositionInOrBeforeNode(Node* anchorNode);
-    static PositionType lastPositionInOrAfterNode(Node* anchorNode);
+    static PositionAlgorithm<Strategy> firstPositionInOrBeforeNode(Node* anchorNode);
+    static PositionAlgorithm<Strategy> lastPositionInOrAfterNode(Node* anchorNode);
 
     void debugPosition(const char* msg = "") const;
 
 #ifndef NDEBUG
     void formatForDebugger(char* buffer, unsigned length) const;
     void showAnchorTypeAndOffset() const;
     void showTreeForThis() const;
     void showTreeForThisInComposedTree() const;
 #endif
 
@@ skipping 18 matching lines @@
     bool m_isLegacyEditingPosition;
 };
 
 extern template class CORE_EXTERN_TEMPLATE_EXPORT PositionAlgorithm<EditingStrategy>;
 extern template class CORE_EXTERN_TEMPLATE_EXPORT PositionAlgorithm<EditingInComposedTreeStrategy>;
 
 using Position = PositionAlgorithm<EditingStrategy>;
 using PositionInComposedTree = PositionAlgorithm<EditingInComposedTreeStrategy>;
 
 template <typename Strategy>
-typename Strategy::PositionType PositionAlgorithm<Strategy>::createLegacyEditingPosition(PassRefPtrWillBeRawPtr<Node> node, int offset)
+typename PositionAlgorithm<Strategy> PositionAlgorithm<Strategy>::createLegacyEditingPosition(PassRefPtrWillBeRawPtr<Node> node, int offset)

[yosin_UTC9, 2015/06/26 08:39:24]

We don't need to have |typename|.
Apply this comments rest of this file.

[yoichio, 2015/06/29 06:00:33]

Done.

 {
-    return PositionType(node, PositionAlgorithm::LegacyEditingOffset(offset));
+    return PositionAlgorithm<Strategy>(node, PositionAlgorithm::LegacyEditingOffset(offset));
 }
 
 inline Position createLegacyEditingPosition(PassRefPtrWillBeRawPtr<Node> node, int offset)
 {
     return Position::createLegacyEditingPosition(node, offset);
 }
 
 template <typename Strategy>
 bool operator==(const PositionAlgorithm<Strategy>& a, const PositionAlgorithm<Strategy>& b)
 {
@@ skipping 17 matching lines @@
 bool operator!=(const PositionAlgorithm<Strategy>& a, const PositionAlgorithm<Strategy>& b)
 {
     return !(a == b);
 }
 
 // We define position creation functions to make callsites more readable.
 // These are inline to prevent ref-churn when returning a Position object.
 // If we ever add a PassPosition we can make these non-inline.
 
 template <typename Strategy>
-typename Strategy::PositionType PositionAlgorithm<Strategy>::inParentBeforeNode(const Node& node)
+typename PositionAlgorithm<Strategy> PositionAlgorithm<Strategy>::inParentBeforeNode(const Node& node)
 {
     // FIXME: This should ASSERT(node.parentNode())
     // At least one caller currently hits this ASSERT though, which indicates
     // that the caller is trying to make a position relative to a disconnected node (which is likely an error)
     // Specifically, editing/deleting/delete-ligature-001.html crashes with ASSERT(node->parentNode())
-    return PositionType(Strategy::parent(node), Strategy::index(node), PositionIsOffsetInAnchor);
+    return PositionAlgorithm<Strategy>(Strategy::parent(node), Strategy::index(node), PositionIsOffsetInAnchor);
 }
 
 inline Position positionInParentBeforeNode(const Node& node)
 {
     return Position::inParentBeforeNode(node);
 }
 
 template <typename Strategy>
-typename Strategy::PositionType PositionAlgorithm<Strategy>::inParentAfterNode(const Node& node)
+typename PositionAlgorithm<Strategy> PositionAlgorithm<Strategy>::inParentAfterNode(const Node& node)
 {
     ASSERT(node.parentNode());
-    return PositionType(Strategy::parent(node), Strategy::index(node) + 1, PositionIsOffsetInAnchor);
+    return PositionAlgorithm<Strategy>(Strategy::parent(node), Strategy::index(node) + 1, PositionIsOffsetInAnchor);
 }
 
 inline Position positionInParentAfterNode(const Node& node)
 {
     return Position::inParentAfterNode(node);
 }
 
 // positionBeforeNode and positionAfterNode return neighbor-anchored positions, construction is O(1)
 template <typename Strategy>
-typename Strategy::PositionType PositionAlgorithm<Strategy>::beforeNode(Node* anchorNode)
+typename PositionAlgorithm<Strategy> PositionAlgorithm<Strategy>::beforeNode(Node* anchorNode)
 {
     ASSERT(anchorNode);
-    return PositionType(anchorNode, PositionIsBeforeAnchor);
+    return PositionAlgorithm<Strategy>(anchorNode, PositionIsBeforeAnchor);
 }
 
 inline Position positionBeforeNode(Node* anchorNode)
 {
     return Position::beforeNode(anchorNode);
 }
 
 template <typename Strategy>
-typename Strategy::PositionType PositionAlgorithm<Strategy>::afterNode(Node* anchorNode)
+typename PositionAlgorithm<Strategy> PositionAlgorithm<Strategy>::afterNode(Node* anchorNode)
 {
     ASSERT(anchorNode);
-    return PositionType(anchorNode, PositionIsAfterAnchor);
+    return PositionAlgorithm<Strategy>(anchorNode, PositionIsAfterAnchor);
 }
 
 inline Position positionAfterNode(Node* anchorNode)
 {
     return Position::afterNode(anchorNode);
 }
 
 template <typename Strategy>
 int PositionAlgorithm<Strategy>::lastOffsetInNode(Node* node)
 {
     return node->offsetInCharacters() ? node->maxCharacterOffset() : static_cast<int>(Strategy::countChildren(*node));
 }
 
 inline int lastOffsetInNode(Node* node)
 {
     return Position::lastOffsetInNode(node);
 }
 
 // firstPositionInNode and lastPositionInNode return parent-anchored positions, lastPositionInNode construction is O(n) due to countChildren()
 template <typename Strategy>
-typename Strategy::PositionType PositionAlgorithm<Strategy>::firstPositionInNode(Node* anchorNode)
+typename PositionAlgorithm<Strategy> PositionAlgorithm<Strategy>::firstPositionInNode(Node* anchorNode)
 {
     if (anchorNode->isTextNode())
-        return PositionType(anchorNode, 0, PositionIsOffsetInAnchor);
-    return PositionType(anchorNode, PositionIsBeforeChildren);
+        return PositionAlgorithm<Strategy>(anchorNode, 0, PositionIsOffsetInAnchor);
+    return PositionAlgorithm<Strategy>(anchorNode, PositionIsBeforeChildren);
 }
 
 inline Position firstPositionInNode(Node* anchorNode)
 {
     return Position::firstPositionInNode(anchorNode);
 }
 
 template <typename Strategy>
-typename Strategy::PositionType PositionAlgorithm<Strategy>::lastPositionInNode(Node* anchorNode)
+typename PositionAlgorithm<Strategy> PositionAlgorithm<Strategy>::lastPositionInNode(Node* anchorNode)
 {
     if (anchorNode->isTextNode())
-        return PositionType(anchorNode, lastOffsetInNode(anchorNode), PositionIsOffsetInAnchor);
-    return PositionType(anchorNode, PositionIsAfterChildren);
+        return PositionAlgorithm<Strategy>(anchorNode, lastOffsetInNode(anchorNode), PositionIsOffsetInAnchor);
+    return PositionAlgorithm<Strategy>(anchorNode, PositionIsAfterChildren);
 }
 
 inline Position lastPositionInNode(Node* anchorNode)
 {
     return Position::lastPositionInNode(anchorNode);
 }
 
 template <typename Strategy>
 int PositionAlgorithm<Strategy>::minOffsetForNode(Node* anchorNode, int offset)
 {
@@ skipping 24 matching lines @@
 
     return offset < currentOffset;
 }
 
 inline bool offsetIsBeforeLastNodeOffset(int offset, Node* anchorNode)
 {
     return Position::offsetIsBeforeLastNodeOffset(offset, anchorNode);
 }
 
 template <typename Strategy>
-typename Strategy::PositionType PositionAlgorithm<Strategy>::firstPositionInOrBeforeNode(Node* node)
+typename PositionAlgorithm<Strategy> PositionAlgorithm<Strategy>::firstPositionInOrBeforeNode(Node* node)
 {
     if (!node)
-        return PositionType();
+        return PositionAlgorithm<Strategy>();
     return Strategy::editingIgnoresContent(node) ? beforeNode(node) : firstPositionInNode(node);
 }
 
 template <typename Strategy>
-typename Strategy::PositionType PositionAlgorithm<Strategy>::lastPositionInOrAfterNode(Node* node)
+typename PositionAlgorithm<Strategy> PositionAlgorithm<Strategy>::lastPositionInOrAfterNode(Node* node)
 {
     if (!node)
-        return PositionType();
+        return PositionAlgorithm<Strategy>();
     return Strategy::editingIgnoresContent(node) ? afterNode(node) : lastPositionInNode(node);
 }
 
 PositionInComposedTree toPositionInComposedTree(const Position&);
 Position toPositionInDOMTree(const PositionInComposedTree&);
 
 } // namespace blink
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showTree(const blink::Position&);
 void showTree(const blink::Position*);
 #endif
 
 #endif // Position_h