Use PositionWithAffinity as internal representation of VisiblePostion

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 31 matching lines @@
 #include "wtf/text/CString.h"
 
 #ifndef NDEBUG
 #include <stdio.h>
 #endif
 
 namespace blink {
 
 using namespace HTMLNames;
 
-VisiblePosition::VisiblePosition(const Position& position, TextAffinity affinity)
+VisiblePosition::VisiblePosition()
 {
-    // TODO(yosin) We should make |VisiblePosition| private and make this
-    // constructor to populate member variables by using |createVisiblePosition()|.
-    *this = createVisiblePosition(position, affinity);
+}
+
+VisiblePosition::VisiblePosition(const PositionWithAffinity& positionWithAffinity)
+    : m_positionWithAffinity(positionWithAffinity)
+{
 }
 
 VisiblePosition VisiblePosition::createWithoutCanonicalization(const PositionWithAffinity& canonicalized)
 {
-    VisiblePosition visiblePosition;
-    visiblePosition.m_deepPosition = canonicalized.position();
-    visiblePosition.m_affinity = canonicalized.affinity();
-    return visiblePosition;
+    return VisiblePosition(canonicalized);
 }
 
 template <typename Strategy>
 PositionWithAffinityTemplate<Strategy> honorEditingBoundaryAtOrBeforeAlgorithm(const PositionWithAffinityTemplate<Strategy>& pos, const PositionAlgorithm<Strategy>& anchor)
 {
     if (pos.isNull())
         return pos;
 
     ContainerNode* highestRoot = highestEditableRoot(anchor);
 
@@ skipping 90 matching lines @@
 }
 
 #ifndef NDEBUG
 
 void VisiblePosition::debugPosition(const char* msg) const
 {
     if (isNull()) {
         fprintf(stderr, "Position [%s]: null\n", msg);
         return;
     }
-    m_deepPosition.debugPosition(msg);
+    deepEquivalent().debugPosition(msg);
 }
 
 void VisiblePosition::formatForDebugger(char* buffer, unsigned length) const
 {
-    m_deepPosition.formatForDebugger(buffer, length);
+    deepEquivalent().formatForDebugger(buffer, length);
 }
 
 void VisiblePosition::showTreeForThis() const
 {
-    m_deepPosition.showTreeForThis();
+    deepEquivalent().showTreeForThis();
 }
 
 #endif
 
 DEFINE_TRACE(VisiblePosition)
 {
-    visitor->trace(m_deepPosition);
+    visitor->trace(m_positionWithAffinity);
 }
 
 } // namespace blink
 
 #ifndef NDEBUG
 
 void showTree(const blink::VisiblePosition* vpos)
 {
     if (vpos)
         vpos->showTreeForThis();
     else
         fprintf(stderr, "Cannot showTree for (nil) VisiblePosition.\n");
 }
 
 void showTree(const blink::VisiblePosition& vpos)
 {
     vpos.showTreeForThis();
 }
 
 #endif