Simplify the usage of PositionWithAffinity

third_party/WebKit/Source/core/editing/FrameCaret.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 122 matching lines @@
 
   if (Page* page = m_frame->page())
     page->animator().scheduleVisualUpdate(m_frame->localFrameRoot());
 }
 
 bool FrameCaret::caretPositionIsValidForDocument(
     const Document& document) const {
   if (!isActive())
     return true;
 
-  return caretPosition().position().document() == document &&
-         !caretPosition().position().isOrphan();
+  return caretPosition().document() == document && !caretPosition().isOrphan();
 }
 
 void FrameCaret::invalidateCaretRect(bool forceInvalidation) {
   if (!m_caretRectDirty)
     return;
   m_caretRectDirty = false;
 
   DCHECK(caretPositionIsValidForDocument(*m_frame->document()));
   LayoutObject* layoutObject = nullptr;
   LayoutRect newRect;
@@ skipping 33 matching lines @@
   } else {
     if (enclosingTextFormControl(caretPosition().position())) {
       if (isVisuallyEquivalentCandidate(caretPosition().position()))
         updateCaretRect(caretPosition());
       else
         updateCaretRect(createVisiblePosition(caretPosition()));
     } else {
       updateCaretRect(createVisiblePosition(caretPosition()));
     }
   }
-  return absoluteBoundsForLocalRect(caretPosition().position().anchorNode(),
+  return absoluteBoundsForLocalRect(caretPosition().anchorNode(),
                                     localCaretRectWithoutUpdate());
 }
 
 void FrameCaret::setShouldShowBlockCursor(bool shouldShowBlockCursor) {
   m_shouldShowBlockCursor = shouldShowBlockCursor;
 
   m_frame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
   updateAppearance();
 }
 
 void FrameCaret::paintCaret(GraphicsContext& context,
                             const LayoutPoint& paintOffset) {
   if (m_caretVisibility == CaretVisibility::Hidden)
     return;
 
   if (!(isActive() && m_shouldPaintCaret))
     return;
 
   updateCaretRect(caretPosition());
-  CaretBase::paintCaret(caretPosition().position().anchorNode(), context,
-                        paintOffset, DisplayItem::kCaret);
+  CaretBase::paintCaret(caretPosition().anchorNode(), context, paintOffset,
+                        DisplayItem::kCaret);
 }
 
 void FrameCaret::dataWillChange(const CharacterData& node) {
   if (node == m_previousCaretNode) {
     // This invalidation is eager, and intentionally uses stale state.
     DisableCompositingQueryAsserts disabler;
     invalidateLocalCaretRect(m_previousCaretNode.get(), m_previousCaretRect);
   }
 }
 
@@ skipping 19 matching lines @@
 
   Element* root = rootEditableElementOf(caretPosition().position());
   if (!root)
     return false;
 
   Element* focusedElement = root->document().focusedElement();
   if (!focusedElement)
     return false;
 
   return focusedElement->isShadowIncludingInclusiveAncestorOf(
-      caretPosition().position().anchorNode());
+      caretPosition().anchorNode());
 }
 
 void FrameCaret::caretBlinkTimerFired(TimerBase*) {
   DCHECK_EQ(m_caretVisibility, CaretVisibility::Visible);
   if (isCaretBlinkingSuspended() && m_shouldPaintCaret)
     return;
   m_shouldPaintCaret = !m_shouldPaintCaret;
   setCaretRectNeedsUpdate();
 }
 
 }  // nemaspace blink