Make Editor::respondToChangedContents take a Position

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * 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 716 matching lines @@
     return false;
 
   Node* startContainer = range.startPosition().computeContainerNode();
   Node* endContainer = range.endPosition().computeContainerNode();
   if (!startContainer || !endContainer)
     return false;
 
   return hasEditableStyle(*startContainer) && hasEditableStyle(*endContainer);
 }
 
-void Editor::respondToChangedContents(const VisibleSelection& endingSelection) {
+void Editor::respondToChangedContents(const Position& position) {
   if (frame().settings() && frame().settings()->getAccessibilityEnabled()) {
-    Node* node = endingSelection.start().anchorNode();
+    Node* node = position.anchorNode();
     if (AXObjectCache* cache = frame().document()->existingAXObjectCache())
       cache->handleEditableTextContentChanged(node);
   }
 
   spellChecker().updateMarkersForWordsAffectedByEditing(true);
   client().respondToChangedContents();
 }
 
 void Editor::removeFormattingAndStyle() {
   DCHECK(frame().document());
@@ skipping 160 matching lines @@
     if (!m_lastEditCommand->undoStep())
       m_undoStack->registerUndoStep(m_lastEditCommand->ensureUndoStep());
     m_lastEditCommand->appendCommandToUndoStep(cmd);
   } else {
     // Only register a new undo command if the command passed in is
     // different from the last command
     m_lastEditCommand = cmd;
     m_undoStack->registerUndoStep(m_lastEditCommand->ensureUndoStep());
   }
 
-  respondToChangedContents(newSelection);
+  respondToChangedContents(newSelection.start());
 }
 
 static VisibleSelection correctedVisibleSelection(
     const VisibleSelection& passedSelection) {
   if (!passedSelection.base().isConnected() ||
       !passedSelection.extent().isConnected())
     return VisibleSelection();
   DCHECK(!passedSelection.base().document()->needsLayoutTreeUpdate());
   VisibleSelection correctedSelection = passedSelection;
   correctedSelection.updateIfNeeded();
@@ skipping 20 matching lines @@
       correctedVisibleSelection(cmd->startingSelection());
   DCHECK(newSelection.isValidFor(*frame().document())) << newSelection;
   if (!newSelection.isNone()) {
     changeSelectionAfterCommand(
         newSelection,
         FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle);
   }
 
   m_lastEditCommand = nullptr;
   m_undoStack->registerRedoStep(cmd);
-  respondToChangedContents(newSelection);
+  respondToChangedContents(newSelection.start());
 }
 
 void Editor::reappliedEditing(UndoStep* cmd) {
   EventQueueScope scope;
 
   dispatchEditableContentChangedEvents(cmd->startingRootEditableElement(),
                                        cmd->endingRootEditableElement());
   dispatchInputEventEditableContentChanged(
       cmd->startingRootEditableElement(), cmd->endingRootEditableElement(),
       InputEvent::InputType::HistoryRedo, nullAtom,
       InputEvent::EventIsComposing::NotComposing);
 
   // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   // In the long term, we should stop editing commands from storing
   // VisibleSelections as starting and ending selections.
   frame().document()->updateStyleAndLayoutIgnorePendingStylesheets();
   const VisibleSelection& newSelection =
       correctedVisibleSelection(cmd->endingSelection());
   DCHECK(newSelection.isValidFor(*frame().document())) << newSelection;
   if (!newSelection.isNone()) {
     changeSelectionAfterCommand(
         newSelection,
         FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle);
   }
 
   m_lastEditCommand = nullptr;
   m_undoStack->registerUndoStep(cmd);
-  respondToChangedContents(newSelection);
+  respondToChangedContents(newSelection.start());
 }
 
 Editor* Editor::create(LocalFrame& frame) {
   return new Editor(frame);
 }
 
 Editor::Editor(LocalFrame& frame)
     : m_frame(&frame),
       m_undoStack(UndoStack::create()),
       m_preventRevealSelection(0),
@@ skipping 765 matching lines @@
 
 DEFINE_TRACE(Editor) {
   visitor->trace(m_frame);
   visitor->trace(m_lastEditCommand);
   visitor->trace(m_undoStack);
   visitor->trace(m_mark);
   visitor->trace(m_typingStyle);
 }
 
 }  // namespace blink