Implementing directional text selection handles

content/browser/renderer_host/render_widget_host_view_aura.cc

 // Copyright (c) 2012 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.
 
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 911 matching lines @@
   clipboard_writer.WriteText(text.substr(pos, n));
 #endif  // defined(USE_X11) && !defined(OS_CHROMEOS)
 }
 
 gfx::Size RenderWidgetHostViewAura::GetRequestedRendererSize() const {
   return delegated_frame_host_->GetRequestedRendererSize();
 }
 
 void RenderWidgetHostViewAura::SelectionBoundsChanged(
     const ViewHostMsg_SelectionBounds_Params& params) {
-  if (selection_anchor_rect_ == params.anchor_rect &&
-      selection_focus_rect_ == params.focus_rect)
+  ui::SelectionBound anchor_bound, focus_bound;
+  gfx::Rect anchor_rect(params.anchor_rect);
+  gfx::Rect focus_rect(params.focus_rect);

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

I think the above copies are not needed and you can get rid of them.

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

Done.

+
+  anchor_bound.edge_top = anchor_rect.origin();
+  anchor_bound.edge_bottom = anchor_rect.bottom_left();
+  focus_bound.edge_top = focus_rect.origin();
+  focus_bound.edge_bottom = focus_rect.bottom_left();
+
+  if (params.anchor_rect == params.focus_rect) {
+    if (params.anchor_rect.x() || params.anchor_rect.y())

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

What does this line exactly check? And, what happens if the condition does not
hold?

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

Got rid of this. I took this from the Clank code, but there was nothing like
this in the old Aura code.

+      anchor_bound.type = focus_bound.type = ui::SelectionBound::CENTER;
+  } else {
+    // Whether text is LTR at the anchor handle.
+    bool anchor_LTR = params.anchor_dir == blink::WebTextDirectionLeftToRight;
+    // Whether text is LTR at the focus handle.
+    bool focus_LTR = params.focus_dir == blink::WebTextDirectionLeftToRight;
+    anchor_bound.type =
+        params.is_anchor_first ^ anchor_LTR ? ui::SelectionBound::RIGHT
+                                            : ui::SelectionBound::LEFT;
+    focus_bound.type =
+        params.is_anchor_first ^ focus_LTR ? ui::SelectionBound::LEFT
+                                           : ui::SelectionBound::RIGHT;
+  }
+
+  if (anchor_bound == selection_anchor_ && focus_bound == selection_focus_)
     return;
 
-  selection_anchor_rect_ = params.anchor_rect;
-  selection_focus_rect_ = params.focus_rect;
-
+  selection_anchor_ = anchor_bound;
+  selection_focus_ = focus_bound;
   if (GetInputMethod())
     GetInputMethod()->OnCaretBoundsChanged(this);
 
-  if (touch_editing_client_) {
-    touch_editing_client_->OnSelectionOrCursorChanged(selection_anchor_rect_,
-        selection_focus_rect_);
-  }
+  if (touch_editing_client_)
+    touch_editing_client_->OnSelectionOrCursorChanged(
+        anchor_bound, focus_bound);
 }
 
 void RenderWidgetHostViewAura::CopyFromCompositingSurface(
     const gfx::Rect& src_subrect,
     const gfx::Size& dst_size,
     CopyFromCompositingSurfaceCallback& callback,
     const SkColorType color_type) {
   delegated_frame_host_->CopyFromCompositingSurface(
       src_subrect, dst_size, callback, color_type);
 }
@@ skipping 530 matching lines @@
     return gfx::Rect(origin.x(),
                      origin.y(),
                      end.x() - origin.x(),
                      end.y() - origin.y());
   }
 
   return rect;
 }
 
 gfx::Rect RenderWidgetHostViewAura::GetCaretBounds() const {
-  const gfx::Rect rect =
-      gfx::UnionRects(selection_anchor_rect_, selection_focus_rect_);
+  gfx::Rect rect =
+      ui::RectBetweenSelectionBounds(selection_anchor_, selection_focus_);
   return ConvertRectToScreen(rect);
 }
 
 bool RenderWidgetHostViewAura::GetCompositionCharacterBounds(
     uint32 index,
     gfx::Rect* rect) const {
   DCHECK(rect);
   if (index >= composition_character_bounds_.size())
     return false;
   *rect = ConvertRectToScreen(composition_character_bounds_[index]);
@@ skipping 873 matching lines @@
     host_->InvalidateScreenInfo();
 
   SnapToPhysicalPixelBoundary();
   // Don't recursively call SetBounds if this bounds update is the result of
   // a Window::SetBoundsInternal call.
   if (!in_bounds_changed_)
     window_->SetBounds(rect);
   host_->WasResized();
   delegated_frame_host_->WasResized();
   if (touch_editing_client_) {
-    touch_editing_client_->OnSelectionOrCursorChanged(selection_anchor_rect_,
-      selection_focus_rect_);
+    touch_editing_client_->OnSelectionOrCursorChanged(selection_anchor_,
+                                                      selection_focus_);
   }
 #if defined(OS_WIN)
   if (mouse_locked_)
     UpdateMouseLockRegion();
 #endif
 }
 
 void RenderWidgetHostViewAura::SchedulePaintIfNotInClip(
     const gfx::Rect& rect,
     const gfx::Rect& clip) {
@@ skipping 137 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewBase, public:
 
 // static
 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }
 
 }  // namespace content