Introduce composed tree version of VisiblePosition

Source/core/editing/VisiblePosition.h

 /*
  * Copyright (C) 2004, 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 56 matching lines @@
 //
 // NOTE: UPSTREAM affinity will be used only if pos is at end of a wrapped line,
 // otherwise it will be converted to DOWNSTREAM.
 template <typename Strategy>
 class CORE_TEMPLATE_CLASS_EXPORT VisiblePositionTemplate final {
     DISALLOW_ALLOCATION();
 public:
     VisiblePositionTemplate();
 
     // Node: Other than |createVisiblePosition()|, we should not use
-    // |createWithoutCanonicalization()|.
-    static VisiblePositionTemplate createWithoutCanonicalization(const PositionWithAffinityTemplate<Strategy>& canonicalized);
+    // |create()|.
+    static VisiblePositionTemplate create(const PositionWithAffinityTemplate<Strategy>&);
 
     // Intentionally delete |operator==()| and |operator!=()| for reducing
     // compilation error message.
     // TODO(yosin) We'll have |equals()| when we have use cases of checking
     // equality of both position and affinity.
     bool operator==(const VisiblePositionTemplate&) const = delete;
     bool operator!=(const VisiblePositionTemplate&) const = delete;
 
     bool isNull() const { return m_positionWithAffinity.isNull(); }
     bool isNotNull() const { return m_positionWithAffinity.isNotNull(); }
@@ skipping 15 matching lines @@
     void showTreeForThis() const;
 #endif
 
 private:
     explicit VisiblePositionTemplate(const PositionWithAffinityTemplate<Strategy>&);
 
     PositionWithAffinityTemplate<Strategy> m_positionWithAffinity;
 };
 
 extern template class CORE_EXTERN_TEMPLATE_EXPORT VisiblePositionTemplate<EditingStrategy>;
+extern template class CORE_EXTERN_TEMPLATE_EXPORT VisiblePositionTemplate<EditingInComposedTreeStrategy>;
 
 using VisiblePosition = VisiblePositionTemplate<EditingStrategy>;
+using VisiblePositionInComposedTree = VisiblePositionTemplate<EditingInComposedTreeStrategy>;
 
 CORE_EXPORT VisiblePosition createVisiblePosition(const Position&, TextAffinity = VP_DEFAULT_AFFINITY);
 CORE_EXPORT VisiblePosition createVisiblePosition(const PositionWithAffinity&);
-CORE_EXPORT VisiblePosition createVisiblePosition(const PositionInComposedTree&, TextAffinity = VP_DEFAULT_AFFINITY);
+CORE_EXPORT VisiblePositionInComposedTree createVisiblePosition(const PositionInComposedTree&, TextAffinity = VP_DEFAULT_AFFINITY);
+
+// TODO(yosin) Once we have composed tree version of VisibleUnits, we should not
+// use |createVisiblePositionInDOMTree()|.
+VisiblePosition createVisiblePositionInDOMTree(const Position&, TextAffinity = VP_DEFAULT_AFFINITY);
+VisiblePosition createVisiblePositionInDOMTree(const PositionInComposedTree&, TextAffinity = VP_DEFAULT_AFFINITY);
 
 } // namespace blink
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showTree(const blink::VisiblePosition*);
 void showTree(const blink::VisiblePosition&);
 #endif
 
 #endif // VisiblePosition_h