Change type of touch selection handles to POPUP

ui/views/touchui/touch_selection_controller_impl_unittest.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 "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 64 matching lines @@
     container->AddChildView(textfield_);
 
     textfield_->SetBoundsRect(params.bounds);
     textfield_->set_id(1);
     widget_->Show();
 
     textfield_->RequestFocus();
   }
 
  protected:
+  gfx::Rect GetCursorRect(const gfx::SelectionModel& sel) {
+    return textfield_->GetRenderText()->GetCursorBounds(sel, true);
+  }
+
   gfx::Point GetCursorPosition(const gfx::SelectionModel& sel) {
-    gfx::RenderText* render_text = textfield_->GetRenderText();
-    gfx::Rect cursor_bounds = render_text->GetCursorBounds(sel, true);
+    gfx::Rect cursor_bounds = GetCursorRect(sel);
     return gfx::Point(cursor_bounds.x(), cursor_bounds.y());
   }
 
   TouchSelectionControllerImpl* GetSelectionController() {
     return static_cast<TouchSelectionControllerImpl*>(
         textfield_->touch_selection_controller_.get());
   }
 
+  void StartTouchEditing() {
+    textfield_->CreateTouchSelectionControllerAndNotifyIt();
+  }
+
+  void EndTouchEditing() {
+    textfield_->touch_selection_controller_.reset();
+  }
+
   void SimulateSelectionHandleDrag(gfx::Point p, int selection_handle) {
     TouchSelectionControllerImpl* controller = GetSelectionController();
     // Do the work of OnMousePressed().
     if (selection_handle == 1)
       controller->SetDraggingHandle(controller->selection_handle_1_.get());
     else
       controller->SetDraggingHandle(controller->selection_handle_2_.get());
 
     // Offset the drag position by the selection handle radius since it is
     // supposed to be in the coordinate system of the handle.
     p.Offset(GetHandleImageSize().width() / 2 + kPadding, 0);
     controller->SelectionHandleDragged(p);
 
     // Do the work of OnMouseReleased().
     controller->dragging_handle_ = NULL;
   }
 
+  gfx::NativeView GetCursorHandleNativeView() {
+    return GetSelectionController()->GetCursorHandleNativeView();
+  }
+
   gfx::Point GetSelectionHandle1Position() {
     return GetSelectionController()->GetSelectionHandle1Position();
   }
 
   gfx::Point GetSelectionHandle2Position() {
     return GetSelectionController()->GetSelectionHandle2Position();
   }
 
   gfx::Point GetCursorHandlePosition() {
     return GetSelectionController()->GetCursorHandlePosition();
   }
 
   bool IsSelectionHandle1Visible() {
     return GetSelectionController()->IsSelectionHandle1Visible();
   }
 
   bool IsSelectionHandle2Visible() {
     return GetSelectionController()->IsSelectionHandle2Visible();
   }
 
   bool IsCursorHandleVisible() {
     return GetSelectionController()->IsCursorHandleVisible();
   }
 
   gfx::RenderText* GetRenderText() {
     return textfield_->GetRenderText();
   }
 
+  gfx::Point GetCursorHandleDragPoint() {
+    gfx::Point point = GetCursorHandlePosition();
+    const gfx::SelectionModel& sel = textfield_->GetSelectionModel();
+    int cursor_height = GetCursorRect(sel).height();
+    point.Offset(GetHandleImageSize().width() / 2 + kPadding,
+                 GetHandleImageSize().height() / 2 + cursor_height);
+    return point;
+  }
+
   Widget* widget_;
 
   Textfield* textfield_;
   scoped_ptr<ViewsTouchSelectionControllerFactory> views_tsc_factory_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TouchSelectionControllerImplTest);
 };
 
 // If textfield has selection, this macro verifies that the selection handles
@@ skipping 329 matching lines @@
   // handle is not eating the event and that the event is falling through to the
   // textfield.
   gfx::Point cursor_pos = GetCursorHandlePosition();
   cursor_pos.Offset(GetHandleImageSize().width() / 2 + kPadding, 0);
   generator.GestureTapAt(cursor_pos);
   generator.GestureTapAt(cursor_pos);
   EXPECT_TRUE(textfield_->HasSelection());
   VERIFY_HANDLE_POSITIONS(false);
 }
 
+TEST_F(TouchSelectionControllerImplTest, HandlesStackAboveParent) {
+  ui::EventTarget* root = GetContext();
+  ui::EventTargeter* targeter = root->GetEventTargeter();
+
+  // Create the first window containing a Views::Textfield.
+  CreateTextfield();
+  widget_->Show();
+  aura::Window* window1 = widget_->GetNativeView();
+
+  // Start touch editing, check that the handle is above the first window, and
+  // end touch editing.
+  StartTouchEditing();
+  gfx::Point test_point = GetCursorHandleDragPoint();
+  ui::MouseEvent test_event1(ui::ET_MOUSE_MOVED, test_point, test_point,
+                             ui::EF_NONE, ui::EF_NONE);
+  EXPECT_EQ(targeter->FindTargetForEvent(root, &test_event1),
+                                         GetCursorHandleNativeView());

[sadrul, 2014/03/14 18:30:07]

The alignment here is confusing. It should be aligned with |targeter instead.

The ordering in EXPECT_EQ is <expected>, <test>. I think in this case, the
hit-test should return the handle's native-view. So GetCursorHandleNativeView()
should b the first param.

[mohsen, 2014/03/14 19:15:25]

Yep, my mistake in both cases. Fixed.

+  EndTouchEditing();
+
+  // Create the second (empty) window over the first one.
+  Widget* second_widget = new Widget;
+  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
+  params.bounds = gfx::Rect(0, 0, 200, 200);
+  second_widget->Init(params);
+  second_widget->Show();
+  aura::Window* window2 = second_widget->GetNativeView();
+
+  // Start touch editing (in the first window) and check that the handle is not
+  // above the second window.
+  StartTouchEditing();
+  ui::MouseEvent test_event2(ui::ET_MOUSE_MOVED, test_point, test_point,
+                             ui::EF_NONE, ui::EF_NONE);
+  EXPECT_EQ(targeter->FindTargetForEvent(root, &test_event2), window2);
+
+  // Move the first window to top and check that the handle is kept above the
+  // first window.
+  window1->GetRootWindow()->StackChildAtTop(window1);
+  ui::MouseEvent test_event3(ui::ET_MOUSE_MOVED, test_point, test_point,
+                             ui::EF_NONE, ui::EF_NONE);
+  EXPECT_EQ(targeter->FindTargetForEvent(root, &test_event3),
+                                         GetCursorHandleNativeView());
+
+  widget_->Close();
+  second_widget->Close();
+}
+
 }  // namespace views