Implementing directional text selection handles

ui/views/touchui/touch_selection_controller_impl.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_UI_VIEWS_TOUCHUI_TOUCH_SELECTION_CONTROLLER_IMPL_H_
 #define UI_UI_VIEWS_TOUCHUI_TOUCH_SELECTION_CONTROLLER_IMPL_H_
 
 #include "base/timer/timer.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/touch/touch_editing_controller.h"
@@ skipping 30 matching lines @@
   bool IsHandleDragInProgress() override;
   void HideHandles(bool quick) override;
 
  private:
   friend class TouchSelectionControllerImplTest;
   friend class test::WidgetTestInteractive;
 
   void SetDraggingHandle(EditingHandleView* handle);
 
   // Callback to inform the client view that the selection handle has been
-  // dragged, hence selection may need to be updated.
+  // dragged, hence selection may need to be updated. |drag_pos| is the new
+  // position for the edge of the selection corresponding to |dragging_handle_|,
+  // specified in handle's coordinates
   void SelectionHandleDragged(const gfx::Point& drag_pos);
 
   // Convenience method to convert a point from a selection handle's coordinate
   // system to that of the client view.
   void ConvertPointToClientView(EditingHandleView* source, gfx::Point* point);
 
   // Convenience method to set a handle's selection rect and hide it if it is

[mohsen, 2014/11/07 16:52:27]

There are a few comments here and in other files that need to be updated to
reflect new variable/function names.

[mfomitchev, 2014/11/10 04:04:12]

Done for this file I think. What are the comments in other files that need
fixing? I couldn't find anything wrong from the quick skim through the changes.

[mohsen, 2014/11/10 22:25:59]

SetHandleSelectionRect() -> SetHandleBound() in
touch_selection_controller_impl.cc which now you've fixed.

   // located out of client view.
-  void SetHandleSelectionRect(EditingHandleView* handle, const gfx::Rect& rect,
-                              const gfx::Rect& rect_in_screen);
+  void SetHandleBound(EditingHandleView* handle,
+                      const ui::SelectionBound& bound,
+                      const ui::SelectionBound& bound_in_screen);
 
   // Checks if handle should be shown for a selection end-point at |rect|.
   // |rect| should be the clipped version of the selection end-point.
-  bool ShouldShowHandleFor(const gfx::Rect& rect) const;
+  bool ShouldShowHandleFor(const ui::SelectionBound& bound) const;
 
   // Overridden from TouchEditingMenuController.
   bool IsCommandIdEnabled(int command_id) const override;
   void ExecuteCommand(int command_id, int event_flags) override;
   void OpenContextMenu() override;
   void OnMenuClosed(TouchEditingMenuView* menu) override;
 
   // Overriden from aura::WindowObserver.
   void OnAncestorWindowTransformed(aura::Window* source,
                                    aura::Window* window) override;
@@ skipping 16 matching lines @@
   void StartContextMenuTimer();
 
   // Convenience method to update the position/visibility of the context menu.
   void UpdateContextMenu();
 
   // Convenience method for hiding context menu.
   void HideContextMenu();
 
   // Convenience methods for testing.
   gfx::NativeView GetCursorHandleNativeView();
-  gfx::Point GetSelectionHandle1Position();
-  gfx::Point GetSelectionHandle2Position();
-  gfx::Point GetCursorHandlePosition();
+  gfx::Rect GetSelectionHandle1Bounds();
+  gfx::Rect GetSelectionHandle2Bounds();
+  gfx::Rect GetCursorHandleBounds();
   bool IsSelectionHandle1Visible();
   bool IsSelectionHandle2Visible();
   bool IsCursorHandleVisible();
+  gfx::Rect GetExpectedHandleBounds(const ui::SelectionBound& bound);
+  views::WidgetDelegateView* GetHandle1View();
+  views::WidgetDelegateView* GetHandle2View();
 
   ui::TouchEditable* client_view_;
   Widget* client_widget_;
   scoped_ptr<EditingHandleView> selection_handle_1_;
   scoped_ptr<EditingHandleView> selection_handle_2_;
   scoped_ptr<EditingHandleView> cursor_handle_;
   TouchEditingMenuView* context_menu_;
 
   // Timer to trigger |context_menu| (|context_menu| is not shown if the
   // selection handles are being updated. It appears only when the handles are
   // stationary for a certain amount of time).
   base::OneShotTimer<TouchSelectionControllerImpl> context_menu_timer_;
 
   // Pointer to the SelectionHandleView being dragged during a drag session.
   EditingHandleView* dragging_handle_;
 
-  // Selection end points. In cursor mode, the two end points are the same and
-  // correspond to |cursor_handle_|; otherwise, they correspond to
-  // |selection_handle_1_| and |selection_handle_2_|, respectively. These
-  // values should be used when selection end points are needed rather than
-  // position of handles which might be invalid when handles are hidden.
-  gfx::Rect selection_end_point_1_;
-  gfx::Rect selection_end_point_2_;
-  // Selection end points, clipped to client view's boundaries.
-  gfx::Rect selection_end_point_1_clipped_;
-  gfx::Rect selection_end_point_2_clipped_;
+  // In cursor mode, the two selection bounds are the same and correspond to
+  // |cursor_handle_|; otherwise, they correspond to |selection_handle_1_| and
+  // |selection_handle_2_|, respectively. These values should be used when
+  // selection bounds needed rather than position of handles which might be
+  // invalid when handles are hidden.
+  ui::SelectionBound selection_bound_1_;
+  ui::SelectionBound selection_bound_2_;
+
+  // Selection bounds, clipped to client view's boundaries.
+  ui::SelectionBound selection_bound_1_clipped_;
+  ui::SelectionBound selection_bound_2_clipped_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchSelectionControllerImpl);
 };
 
 }  // namespace views
 
 #endif  // UI_UI_VIEWS_TOUCHUI_TOUCH_SELECTION_CONTROLLER_IMPL_H_