Make DragCaretController store PositionWithAffinity instead of VisiblePosition

third_party/WebKit/Source/core/editing/DragCaretController.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 21 matching lines @@
 
 namespace blink {
 
 DragCaretController::DragCaretController() : m_caretBase(new CaretBase()) {}
 
 DragCaretController* DragCaretController::create() {
   return new DragCaretController;
 }
 
 bool DragCaretController::hasCaretIn(const LayoutBlock& layoutBlock) const {
-  Node* node = m_position.deepEquivalent().anchorNode();
+  Node* node = m_position.position().anchorNode();
   if (!node)
     return false;
   if (layoutBlock != CaretBase::caretLayoutObject(node))
     return false;
-  if (rootEditableElementOf(m_position))
+  if (rootEditableElementOf(m_position.position()))
     return true;
   Settings* settings = node->ownerDocument()->frame()->settings();
   return settings && settings->caretBrowsingEnabled();
 }
 
 bool DragCaretController::isContentRichlyEditable() const {
-  return isRichlyEditablePosition(m_position.deepEquivalent());
+  return isRichlyEditablePosition(m_position.position());
 }
 
 void DragCaretController::setCaretPosition(
     const PositionWithAffinity& position) {
   // for querying Layer::compositingState()
   // This code is probably correct, since it doesn't occur in a stack that
   // involves updating compositing state.
   DisableCompositingQueryAsserts disabler;
 
-  if (Node* node = m_position.deepEquivalent().anchorNode())
+  if (Node* node = m_position.position().anchorNode())
     m_caretBase->invalidateCaretRect(node);
-  m_position = createVisiblePosition(position);
+  m_position = createVisiblePosition(position).toPositionWithAffinity();
   Document* document = nullptr;
-  if (Node* node = m_position.deepEquivalent().anchorNode()) {
+  if (Node* node = m_position.position().anchorNode()) {
     m_caretBase->invalidateCaretRect(node);
     document = &node->document();
   }
-  if (m_position.isNull() || m_position.isOrphan()) {
+  if (m_position.isNull()) {
     m_caretBase->clearCaretRect();
   } else {
+    DCHECK(!m_position.position().isOrphan());
     document->updateStyleAndLayoutTree();
     m_caretBase->updateCaretRect(m_position);
   }
 }
 
 static bool removingNodeRemovesPosition(Node& node, const Position& position) {
   if (!position.anchorNode())
     return false;
 
   if (position.anchorNode() == node)
     return true;
 
   if (!node.isElementNode())
     return false;
 
   Element& element = toElement(node);
   return element.isShadowIncludingInclusiveAncestorOf(position.anchorNode());
 }
 
 void DragCaretController::nodeWillBeRemoved(Node& node) {
   if (!hasCaret() || !node.inActiveDocument())
     return;
 
-  if (!removingNodeRemovesPosition(node, m_position.deepEquivalent()))
+  if (!removingNodeRemovesPosition(node, m_position.position()))
     return;
 
-  m_position.deepEquivalent().document()->layoutViewItem().clearSelection();
+  m_position.position().document()->layoutViewItem().clearSelection();
   clear();
 }
 
 DEFINE_TRACE(DragCaretController) {
   visitor->trace(m_position);
   visitor->trace(m_caretBase);
 }
 
 void DragCaretController::paintDragCaret(LocalFrame* frame,
                                          GraphicsContext& context,
                                          const LayoutPoint& paintOffset) const {
-  if (m_position.deepEquivalent().anchorNode()->document().frame() == frame)
-    m_caretBase->paintCaret(m_position.deepEquivalent().anchorNode(), context,
+  if (m_position.position().anchorNode()->document().frame() == frame)
+    m_caretBase->paintCaret(m_position.position().anchorNode(), context,
                             paintOffset, DisplayItem::kDragCaret);
 }
 
 }  // namespace blink