Make VisiblePosition constructor to canonicalize a position in composed tree

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 36 matching lines @@
 namespace blink {
 
 using namespace HTMLNames;
 
 VisiblePosition::VisiblePosition(const Position &pos, EAffinity affinity)
 {
     init(pos, affinity);
 }
 
 VisiblePosition::VisiblePosition(const PositionInComposedTree& pos, EAffinity affinity)
-    : VisiblePosition(toPositionInDOMTree(pos), affinity)
 {
+    init(pos, affinity);
 }
 
 VisiblePosition::VisiblePosition(const PositionWithAffinity& positionWithAffinity)
 {
     init(positionWithAffinity.position(), positionWithAffinity.affinity());
 }
 
 VisiblePosition VisiblePosition::next(EditingBoundaryCrossingRule rule) const
 {
     VisiblePosition next(nextVisuallyDistinctCandidate(m_deepPosition), m_affinity);
@@ skipping 576 matching lines @@
 PositionInComposedTree canonicalPositionOf(const PositionInComposedTree& position)
 {
     return canonicalPosition(position);
 }
 
 template<typename PositionType>
 void VisiblePosition::init(const PositionType& position, EAffinity affinity)
 {
     m_affinity = affinity;
 
-    m_deepPosition = canonicalPosition(position);
+    PositionType deepPosition = canonicalPosition(position);
+    m_deepPosition = toPositionInDOMTree(deepPosition);
 
     if (m_affinity != UPSTREAM)
         return;
 
     if (isNull()) {
         m_affinity = DOWNSTREAM;
         return;
     }
 
     // When not at a line wrap, make sure to end up with DOWNSTREAM affinity.
-    if (!inSameLine(PositionWithAffinity(m_deepPosition, DOWNSTREAM), PositionWithAffinity(m_deepPosition, UPSTREAM)))
+    using PositionWithAffinityType = PositionWithAffinityTemplate<PositionType>;
+    if (!inSameLine(PositionWithAffinityType(deepPosition, DOWNSTREAM), PositionWithAffinityType(deepPosition, UPSTREAM)))
         return;
     m_affinity = 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.containerNode() || !pos.containerNode()->isTextNode())
@@ skipping 158 matching lines @@
     else
         fprintf(stderr, "Cannot showTree for (nil) VisiblePosition.\n");
 }
 
 void showTree(const blink::VisiblePosition& vpos)
 {
     vpos.showTreeForThis();
 }
 
 #endif