diff options
| author | mohsen@chromium.org <mohsen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-30 23:46:37 +0000 |
|---|---|---|
| committer | mohsen@chromium.org <mohsen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-30 23:46:37 +0000 |
| commit | 90df3ca2ba8de3d8a8fc55b3474be42d49ad9fbc (patch) | |
| tree | ce3086eb3991ba21d68577d6ca3489ba24518534 /ui | |
| parent | 122f41fe08cd0dac8d11c037456392f74ad216dd (diff) | |
| download | chromium_src-90df3ca2ba8de3d8a8fc55b3474be42d49ad9fbc.zip chromium_src-90df3ca2ba8de3d8a8fc55b3474be42d49ad9fbc.tar.gz chromium_src-90df3ca2ba8de3d8a8fc55b3474be42d49ad9fbc.tar.bz2 | |
Re-enable TouchSelectionOriginatingFromWebpageTest with some fixes and logs
Re-enabled
TouchEditableImplAuraTest.TouchSelectionOriginatingFromWebpageTest with
two fixes:
- Fixed calculations for selection rectangle after a touch selection
handle is moved.
- Added a wait between dragging the handle and getting the selection in
the test to be sure that the selection is updated completely.
Also, added some logs in the test so that if it failed again, more data
is available for investigation.
BUG=276870
Review URL: https://chromiumcodereview.appspot.com/23449013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220699 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/views/touchui/touch_selection_controller_impl.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/views/touchui/touch_selection_controller_impl.cc b/ui/views/touchui/touch_selection_controller_impl.cc index 8b6b351..89f6bdc 100644 --- a/ui/views/touchui/touch_selection_controller_impl.cc +++ b/ui/views/touchui/touch_selection_controller_impl.cc @@ -193,7 +193,7 @@ class TouchSelectionControllerImpl::EditingHandleView case ui::ET_GESTURE_SCROLL_BEGIN: widget_->SetCapture(this); controller_->SetDraggingHandle(this); - drag_offset_ = event->y() - cursor_height() - + drag_offset_ = event->y() - cursor_height() + kSelectionHandleVerticalDragOffset; break; case ui::ET_GESTURE_SCROLL_UPDATE: { @@ -259,6 +259,10 @@ class TouchSelectionControllerImpl::EditingHandleView scoped_ptr<Widget> widget_; TouchSelectionControllerImpl* controller_; gfx::Rect selection_rect_; + + // Vertical offset between the scroll event position and the drag position + // reported to the client view (see the ASCII figure at the top of the file + // and its description for more details). int drag_offset_; // If set to true, the handle will not draw anything, hence providing an empty |