Revert of Make FrameSelection to hold non-canonicalized positions

third_party/WebKit/Source/core/editing/FrameSelection.h

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 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
@@ skipping 27 matching lines @@
 #include "core/layout/ScrollAlignment.h"
 #include "platform/Timer.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/geometry/LayoutRect.h"
 #include "platform/graphics/PaintInvalidationReason.h"
 #include "platform/heap/Handle.h"
 #include "wtf/Noncopyable.h"
 
 namespace blink {
 
+class CharacterData;
 class DisplayItemClient;
 class LayoutBlock;
 class LocalFrame;
 class FrameCaret;
 class GranularityStrategy;
 class GraphicsContext;
 class HTMLFormElement;
 class SelectionEditor;
 class PendingSelection;
+class Text;
 class TextIteratorBehavior;
 struct PaintInvalidatorContext;
 
 enum class CursorAlignOnScroll { IfNeeded, Always };
 
 enum EUserTriggered { NotUserTriggered = 0, UserTriggered = 1 };
 
 enum RevealExtentOption { RevealExtent, DoNotRevealExtent };
 
 enum class SelectionDirectionalMode { NonDirectional, Directional };
@@ skipping 15 matching lines @@
   ~FrameSelection();
 
   enum EAlteration { AlterationMove, AlterationExtend };
   enum SetSelectionOption {
     // 1 << 0 is reserved for EUserTriggered
     CloseTyping = 1 << 1,
     ClearTypingStyle = 1 << 2,
     DoNotSetFocus = 1 << 3,
     DoNotUpdateAppearance = 1 << 4,
     DoNotClearStrategy = 1 << 5,
-    // TODO(yosin): We should get rid of |DoNotAdjustInFlatTree|.
     DoNotAdjustInFlatTree = 1 << 6,
   };
   // Union of values in SetSelectionOption and EUserTriggered
   typedef unsigned SetSelectionOptions;
   static inline EUserTriggered selectionOptionsToUserTriggered(
       SetSelectionOptions options) {
     return static_cast<EUserTriggered>(options & UserTriggered);
   }
 
   bool isAvailable() const { return lifecycleContext(); }
   // You should not call |document()| when |!isAvailable()|.
-  Document& document() const;
+  const Document& document() const;
+  Document& document();
   LocalFrame* frame() const { return m_frame; }
   Element* rootEditableElement() const {
     return selection().rootEditableElement();
   }
   Element* rootEditableElementOrDocumentElement() const;
   ContainerNode* rootEditableElementOrTreeScopeRootNode() const;
 
   bool hasEditableStyle() const { return selection().hasEditableStyle(); }
   bool isContentEditable() const { return selection().isContentEditable(); }
   bool isContentRichlyEditable() const {
     return selection().isContentRichlyEditable();
   }
 
   // An implementation of |WebFrame::moveCaretSelection()|
   void moveCaretSelection(const IntPoint&);
 
   template <typename Strategy>
   const VisibleSelectionTemplate<Strategy>& visibleSelection() const;
-  const VisibleSelection& computeVisibleSelectionInDOMTree() const;
-  const VisibleSelectionInFlatTree& computeVisibleSelectionInFlatTree() const;
 
   const VisibleSelection& selection() const;
 
   void setSelection(const SelectionInDOMTree&,
                     SetSelectionOptions = CloseTyping | ClearTypingStyle,
                     CursorAlignOnScroll = CursorAlignOnScroll::IfNeeded,
                     TextGranularity = CharacterGranularity);
 
   void setSelection(const SelectionInFlatTree&,
                     SetSelectionOptions = CloseTyping | ClearTypingStyle,
@@ skipping 61 matching lines @@
 
   // Returns true if specified layout block should paint caret. This function is
   // called during painting only.
   bool shouldPaintCaret(const LayoutBlock&) const;
 
   // Bounds of (possibly transformed) caret in absolute coords
   IntRect absoluteCaretBounds();
 
   void didChangeFocus();
 
-  const SelectionInDOMTree& selectionInDOMTree() const;
-  // TODO(yosin): We should rename |isNone()| to |isVisibleNone()|.
   bool isNone() const { return selection().isNone(); }
   bool isCaret() const { return selection().isCaret(); }
   bool isRange() const { return selection().isRange(); }
   bool isInPasswordField() const;
-  bool isDirectional() const { return selectionInDOMTree().isDirectional(); }
+  bool isDirectional() const { return selection().isDirectional(); }
 
   // If this FrameSelection has a logical range which is still valid, this
   // function return its clone. Otherwise, the return value from underlying
   // VisibleSelection's firstRange() is returned.
   Range* firstRange() const;
 
   void documentAttached(Document*);
 
   void didLayout();
   bool isAppearanceDirty() const;
@@ skipping 17 matching lines @@
   bool isCaretBlinkingSuspended() const;
 
   // Focus
   void setFocused(bool);
   bool isFocused() const { return m_focused; }
   bool isFocusedAndActive() const;
   void pageActivationChanged();
 
   void setUseSecureKeyboardEntryWhenActive(bool);
 
-  bool isHandleVisible() const;
+  bool isHandleVisible() const {
+    return m_handleVisibility == HandleVisibility::Visible;
+  }
 
   void updateSecureKeyboardEntryIfActive();
 
   // Returns true if a word is selected.
   bool selectWordAroundPosition(const VisiblePosition&);
 
 #ifndef NDEBUG
   void showTreeForThis() const;
 #endif
 
@@ skipping 43 matching lines @@
                            FullDocumentPaintingWithCaret);
 
   explicit FrameSelection(LocalFrame&);
 
   const DisplayItemClient& caretDisplayItemClientForTesting() const;
 
   // Note: We have |selectionInFlatTree()| for unit tests, we should
   // use |visibleSelection<EditingInFlatTreeStrategy>()|.
   const VisibleSelectionInFlatTree& selectionInFlatTree() const;
 
+  template <typename Strategy>
+  void setSelectionAlgorithm(const VisibleSelectionTemplate<Strategy>&,
+                             HandleVisibility,
+                             SetSelectionOptions,
+                             CursorAlignOnScroll,
+                             TextGranularity);
+
+  void respondToNodeModification(Node&,
+                                 bool baseRemoved,
+                                 bool extentRemoved,
+                                 bool startRemoved,
+                                 bool endRemoved);
+
   void notifyAccessibilityForSelectionChange();
   void notifyCompositorForSelectionChange();
   void notifyEventHandlerForSelectionChange();
 
   void focusedOrActiveStateChanged();
 
   void setUseSecureKeyboardEntry(bool);
 
   void updateSelectionIfNeeded(const Position& base,
                                const Position& extent,
                                const Position& start,
                                const Position& end);
 
   GranularityStrategy* granularityStrategy();
 
   // Implementation of |SynchronousMutationObserver| member functions.
   void contextDestroyed(Document*) final;
   void nodeChildrenWillBeRemoved(ContainerNode&) final;
   void nodeWillBeRemoved(Node&) final;
+  void didUpdateCharacterData(CharacterData*,
+                              unsigned offset,
+                              unsigned oldLength,
+                              unsigned newLength) final;
+  void didMergeTextNodes(const Text& mergedNode,
+                         const NodeWithIndex& nodeToBeRemovedWithIndex,
+                         unsigned oldLength) final;
+  void didSplitTextNode(const Text& oldNode) final;
 
   Member<LocalFrame> m_frame;
   const Member<PendingSelection> m_pendingSelection;
   const Member<SelectionEditor> m_selectionEditor;
 
   TextGranularity m_granularity;
   LayoutUnit m_xPosForVerticalArrowNavigation;
 
   bool m_focused : 1;
 
+  HandleVisibility m_handleVisibility = HandleVisibility::NotVisible;
+
   // Controls text granularity used to adjust the selection's extent in
   // moveRangeSelectionExtent.
   std::unique_ptr<GranularityStrategy> m_granularityStrategy;
 
   const Member<FrameCaret> m_frameCaret;
   bool m_useSecureKeyboardEntryWhenActive = false;
 };
 
 }  // namespace blink
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showTree(const blink::FrameSelection&);
 void showTree(const blink::FrameSelection*);
 #endif
 
 #endif  // FrameSelection_h