Simplify the usage of PositionWithAffinity

third_party/WebKit/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.
@@ skipping 41 matching lines @@
 #endif
 {
 }
 
 template <typename Strategy>
 VisiblePositionTemplate<Strategy>::VisiblePositionTemplate(
     const PositionWithAffinityTemplate<Strategy>& positionWithAffinity)
     : m_positionWithAffinity(positionWithAffinity)
 #if DCHECK_IS_ON()
       ,
-      m_domTreeVersion(
-          positionWithAffinity.position().document()->domTreeVersion()),
-      m_styleVersion(positionWithAffinity.position().document()->styleVersion())
+      m_domTreeVersion(positionWithAffinity.document()->domTreeVersion()),
+      m_styleVersion(positionWithAffinity.document()->styleVersion())
 #endif
 {
 }
 
 template <typename Strategy>
 VisiblePositionTemplate<Strategy> VisiblePositionTemplate<Strategy>::create(
     const PositionWithAffinityTemplate<Strategy>& positionWithAffinity) {
   if (positionWithAffinity.isNull())
     return VisiblePositionTemplate<Strategy>();
-  DCHECK(positionWithAffinity.position().isConnected()) << positionWithAffinity;
+  DCHECK(positionWithAffinity.isConnected()) << positionWithAffinity;
 
-  Document& document = *positionWithAffinity.position().document();
+  Document& document = *positionWithAffinity.document();
   DCHECK(!document.needsLayoutTreeUpdate());
   DocumentLifecycle::DisallowTransitionScope disallowTransition(
       document.lifecycle());
 
   const PositionTemplate<Strategy> deepPosition =
       canonicalPositionOf(positionWithAffinity.position());
   if (deepPosition.isNull())
     return VisiblePositionTemplate<Strategy>();
   const PositionWithAffinityTemplate<Strategy> downstreamPosition(deepPosition);
   if (positionWithAffinity.affinity() == TextAffinity::Downstream)
@@ skipping 153 matching lines @@
   deepEquivalent().showTreeForThis();
 }
 
 #endif
 
 template <typename Strategy>
 bool VisiblePositionTemplate<Strategy>::isValid() const {
 #if DCHECK_IS_ON()
   if (isNull())
     return true;
-  Document& document = *m_positionWithAffinity.position().document();
+  Document& document = *m_positionWithAffinity.document();
   return m_domTreeVersion == document.domTreeVersion() &&
          m_styleVersion == document.styleVersion() &&
          !document.needsLayoutTreeUpdate();
 #else
   return true;
 #endif
 }
 
 template class CORE_TEMPLATE_EXPORT VisiblePositionTemplate<EditingStrategy>;
 template class CORE_TEMPLATE_EXPORT
@@ skipping 19 matching lines @@
     return;
   }
   DVLOG(0) << "Cannot showTree for (nil) VisiblePosition.";
 }
 
 void showTree(const blink::VisiblePosition& vpos) {
   vpos.showTreeForThis();
 }
 
 #endif