Move setNonDirectionalSelectionIfNeeded() to SelectionController from FrameSelection

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

 /*
  * Copyright (C) 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2015 Google 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 21 matching lines @@
 #include "core/editing/VisibleSelection.h"
 #include "core/page/EventWithHitTestResults.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {
 
 class FrameSelection;
 class HitTestResult;
 class LocalFrame;
 
-class SelectionController final : public GarbageCollected<SelectionController> {
+class CORE_EXPORT SelectionController final
+    : public GarbageCollectedFinalized<SelectionController> {
   WTF_MAKE_NONCOPYABLE(SelectionController);
 
  public:
   static SelectionController* create(LocalFrame&);
-  DECLARE_TRACE();
+  DECLARE_VIRTUAL_TRACE();

[tkent, 2016/10/24 07:40:59]

Why do you make it virtual?

[yosin_UTC9, 2016/10/24 08:18:03]

Just follow FrameSelection... Use |DEFINE_TRACE()| for |SelectionController|.
I make FrameSelection not use DEFINE_VIRTUAL_TRACE(),
http://crrev.com/2443883002

 
+  void documentDetached();
   void handleMousePressEvent(const MouseEventWithHitTestResults&);
   bool handleMousePressEventSingleClick(const MouseEventWithHitTestResults&);
   bool handleMousePressEventDoubleClick(const MouseEventWithHitTestResults&);
   bool handleMousePressEventTripleClick(const MouseEventWithHitTestResults&);
   void handleMouseDraggedEvent(const MouseEventWithHitTestResults&,
                                const IntPoint&,
                                const LayoutPoint&,
                                Node*,
                                const IntPoint&);
   bool handleMouseReleaseEvent(const MouseEventWithHitTestResults&,
@@ skipping 14 matching lines @@
   void initializeSelectionState();
   void setMouseDownMayStartSelect(bool);
   bool mouseDownMayStartSelect() const;
   bool mouseDownWasSingleClickInSelection() const;
   void notifySelectionChanged();
   bool hasExtendedSelection() const {
     return m_selectionState == SelectionState::ExtendedSelection;
   }
 
  private:
+  friend class SelectionControllerTest;
+
   explicit SelectionController(LocalFrame&);
 
   enum class AppendTrailingWhitespace { ShouldAppend, DontAppend };
   enum class SelectInputEventType { Touch, Mouse };
+  enum EndPointsAdjustmentMode {
+    AdjustEndpointsAtBidiBoundary,
+    DoNotAdjustEndpoints
+  };
+
+  Document& document() const;
 
   void selectClosestWordFromHitTestResult(const HitTestResult&,
                                           AppendTrailingWhitespace,
                                           SelectInputEventType);
   void selectClosestMisspellingFromHitTestResult(const HitTestResult&,
                                                  AppendTrailingWhitespace);
   void selectClosestWordFromMouseEvent(const MouseEventWithHitTestResults&);
   void selectClosestMisspellingFromMouseEvent(
       const MouseEventWithHitTestResults&);
   void selectClosestWordOrLinkFromMouseEvent(
       const MouseEventWithHitTestResults&);
+  void setNonDirectionalSelectionIfNeeded(const VisibleSelectionInFlatTree&,
+                                          TextGranularity,
+                                          EndPointsAdjustmentMode);
   bool updateSelectionForMouseDownDispatchingSelectStart(
       Node*,
       const VisibleSelectionInFlatTree&,
       TextGranularity);
 
   FrameSelection& selection() const;
 
   Member<LocalFrame> const m_frame;
+  // TODO(yosin): We should use |PositionWIthAffinityInFlatTree| since we
+  // should reduce usage of |VisibleSelectionInFlatTree|.
+  // Used to store base before the adjustment at bidi boundary
+  VisiblePositionInFlatTree m_originalBaseInFlatTree;
   bool m_mouseDownMayStartSelect;
   bool m_mouseDownWasSingleClickInSelection;
   bool m_mouseDownAllowsMultiClick;
   enum class SelectionState {
     HaveNotStartedSelection,
     PlacedCaret,
     ExtendedSelection
   };
   SelectionState m_selectionState;
 };
 
 bool isLinkSelection(const MouseEventWithHitTestResults&);
 bool isExtendingSelection(const MouseEventWithHitTestResults&);
 
 }  // namespace blink
 
 #endif  // SelectionController_h