Simplify the usage of PositionWithAffinity

third_party/WebKit/Source/core/editing/CaretBase.cpp

 /*
  * Copyright (C) 2004, 2008, 2009, 2010 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 86 matching lines @@
     caretLayoutItem = containerItem;
   }
 
   if (unrooted)
     caretRect = LayoutRect();
 }
 
 void CaretBase::updateCaretRect(const PositionWithAffinity& caretPosition) {
   m_caretLocalRect = LayoutRect();
 
-  if (caretPosition.position().isNull())
+  if (caretPosition.isNull())
     return;
 
-  DCHECK(caretPosition.position().anchorNode()->layoutObject());
+  DCHECK(caretPosition.anchorNode()->layoutObject());
 
   // First compute a rect local to the layoutObject at the selection start.
   LayoutObject* layoutObject;
   m_caretLocalRect = localCaretRectOfPosition(caretPosition, layoutObject);
 
   // Get the layoutObject that will be responsible for painting the caret
   // (which is either the layoutObject we just found, or one of its containers).
   LayoutBlockItem caretPainterItem =
-      LayoutBlockItem(caretLayoutObject(caretPosition.position().anchorNode()));
+      LayoutBlockItem(caretLayoutObject(caretPosition.anchorNode()));
 
   mapCaretRectToCaretPainter(LayoutItem(layoutObject), caretPainterItem,
                              m_caretLocalRect);
 }
 
 void CaretBase::updateCaretRect(const VisiblePosition& caretPosition) {
   updateCaretRect(caretPosition.toPositionWithAffinity());
 }
 
 IntRect CaretBase::absoluteBoundsForLocalRect(Node* node,
@@ skipping 66 matching lines @@
 
 String CaretBase::debugName() const {
   return "Caret";
 }
 
 LayoutRect CaretBase::visualRect() const {
   return m_visualRect;
 }
 
 }  // namespace blink