Make FrameCaret to retrieve caret position from SelectionEditor

third_party/WebKit/Source/core/editing/FrameSelection.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 81 matching lines @@
     return frame->editor().behavior().shouldConsiderSelectionAsDirectional();
 }
 
 FrameSelection::FrameSelection(LocalFrame* frame)
     : m_frame(frame)
     , m_pendingSelection(PendingSelection::create(*this))
     , m_selectionEditor(SelectionEditor::create(*this))
     , m_granularity(CharacterGranularity)
     , m_xPosForVerticalArrowNavigation(NoXPosForVerticalArrowNavigation())
     , m_focused(frame->page() && frame->page()->focusController().focusedFrame() == frame)
-    , m_frameCaret(new FrameCaret(frame))
+    , m_frameCaret(new FrameCaret(frame, *m_selectionEditor))
 {
     DCHECK(frame);
 }
 
 FrameSelection::~FrameSelection()
 {
 }
 
 const Document& FrameSelection::document() const
 {
@@ skipping 200 matching lines @@
         // changed.
         m_frame->inputMethodController().cancelCompositionIfSelectionIsInvalid();
         notifyLayoutObjectOfSelectionChange(userTriggered);
         return;
     }
 
     const VisibleSelectionTemplate<Strategy> oldSelection = visibleSelection<Strategy>();
     const VisibleSelection oldSelectionInDOMTree = selection();
 
     m_selectionEditor->setVisibleSelection(s, options);
-    if (s.isCaret())
-        m_frameCaret->setCaretPosition(PositionWithAffinity(toPositionInDOMTree(s.start()), s.affinity()));
-    else
-        m_frameCaret->clear();
+    m_frameCaret->setCaretRectNeedsUpdate();
 
     if (!s.isNone() && !(options & DoNotSetFocus)) {
         setFocusedNodeIfNeeded();
         // |setFocusedNodeIfNeeded()| dispatches sync events "FocusOut" and
         // "FocusIn", |m_frame| may associate to another document.
         if (!isAvailable() || document() != currentDocument) {
             // Once we get test case to reach here, we should change this
             // if-statement to |DCHECK()|.
             NOTREACHED();
             return;
@@ skipping 133 matching lines @@
         // If we did nothing here, when this node's layoutObject was destroyed, the rect that it
         // occupied would be invalidated, but, selection gaps that change as a result of
         // the removal wouldn't be invalidated.
         // FIXME: Don't do so much unnecessary invalidation.
         clearLayoutTreeSelection = true;
     }
 
     if (clearLayoutTreeSelection)
         selection().start().document()->layoutViewItem().clearSelection();
 
-    if (clearDOMTreeSelection) {
+    if (clearDOMTreeSelection)
         setSelection(VisibleSelection(), DoNotSetFocus);
-    } else {
-        const VisibleSelection& selection = m_selectionEditor->visibleSelection<EditingStrategy>();
-        if (selection.isCaret())
-            m_frameCaret->setCaretPosition(PositionWithAffinity(selection.start(), selection.affinity()));
-        else
-            m_frameCaret->clear();
-    }
+    m_frameCaret->setCaretRectNeedsUpdate();
 
     // TODO(yosin): We should move to call |TypingCommand::closeTyping()| to
     // |Editor| class.
     if (!document().isRunningExecCommand())
         TypingCommand::closeTyping(m_frame);
 }
 
 static Position updatePositionAfterAdoptingTextReplacement(const Position& position, CharacterData* node, unsigned offset, unsigned oldLength, unsigned newLength)
 {
     if (!position.anchorNode() || position.anchorNode() != node || !position.isOffsetInAnchor())
@@ skipping 882 matching lines @@
 
 void showTree(const blink::FrameSelection* sel)
 {
     if (sel)
         sel->showTreeForThis();
     else
         fprintf(stderr, "Cannot showTree for (nil) FrameSelection.\n");
 }
 
 #endif