Move setNonDirectionalSelectionIfNeeded() to SelectionController from FrameSelection

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 231 matching lines @@
 
   void updateSecureKeyboardEntryIfActive();
 
   // Returns true if a word is selected.
   bool selectWordAroundPosition(const VisiblePosition&);
 
 #ifndef NDEBUG
   void showTreeForThis() const;
 #endif
 
-  enum EndPointsAdjustmentMode {
-    AdjustEndpointsAtBidiBoundary,
-    DoNotAdjustEndpoints
-  };
-  void setNonDirectionalSelectionIfNeeded(
-      const VisibleSelectionInFlatTree&,
-      TextGranularity,
-      EndPointsAdjustmentMode = DoNotAdjustEndpoints);
   void setFocusedNodeIfNeeded();
   void notifyLayoutObjectOfSelectionChange(EUserTriggered);
 
   EditingStyle* typingStyle() const;
   void setTypingStyle(EditingStyle*);
   void clearTypingStyle();
 
   String selectedHTMLForClipboard() const;
   String selectedText(TextIteratorBehavior = TextIteratorDefaultBehavior) const;
   String selectedTextForClipboard() const;
@@ skipping 18 matching lines @@
   // |FrameSelection::selection()| to make sure we use updated selection,
   // rather than having |updateIfNeeded()|. Once, we update all layout tests
   // to use updated selection, we should make |updateIfNeeded()| private.
   void updateIfNeeded();
 
   DECLARE_VIRTUAL_TRACE();
 
  private:
   friend class FrameSelectionTest;
   friend class PaintControllerPaintTestForSlimmingPaintV1AndV2;
+  friend class SelectionControllerTest;
   FRIEND_TEST_ALL_PREFIXES(PaintControllerPaintTestForSlimmingPaintV1AndV2,
                            FullDocumentPaintingWithCaret);
 
   explicit FrameSelection(LocalFrame*);
 
   // Note: We have |selectionInFlatTree()| for unit tests, we should
   // use |visibleSelection<EditingInFlatTreeStrategy>()|.
   const VisibleSelectionInFlatTree& selectionInFlatTree() const;
 
   template <typename Strategy>
-  VisiblePositionTemplate<Strategy> originalBase() const;
-  void setOriginalBase(const VisiblePosition&);
-  void setOriginalBase(const VisiblePositionInFlatTree&);
-
-  template <typename Strategy>
   void setSelectionAlgorithm(const VisibleSelectionTemplate<Strategy>&,
                              SetSelectionOptions,
                              CursorAlignOnScroll,
                              TextGranularity);
 
   void respondToNodeModification(Node&,
                                  bool baseRemoved,
                                  bool extentRemoved,
                                  bool startRemoved,
                                  bool endRemoved);
@@ skipping 15 matching lines @@
 
   // For unittests
   bool shouldPaintCaretForTesting() const;
   bool isPreviousCaretDirtyForTesting() const;
 
   Member<Document> m_document;
   Member<LocalFrame> m_frame;
   const Member<PendingSelection> m_pendingSelection;
   const Member<SelectionEditor> m_selectionEditor;
 
-  // Used to store base before the adjustment at bidi boundary
-  VisiblePositionInFlatTree m_originalBaseInFlatTree;
   TextGranularity m_granularity;
   LayoutUnit m_xPosForVerticalArrowNavigation;
 
   Member<EditingStyle> m_typingStyle;
 
   bool m_focused : 1;
 
   // Controls text granularity used to adjust the selection's extent in
   // moveRangeSelectionExtent.
   std::unique_ptr<GranularityStrategy> m_granularityStrategy;
@@ skipping 14 matching lines @@
 }
 }  // 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