Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Side by Side Diff: content/browser/renderer_host/input/touch_selection_controller.cc

Issue 482723002: Do not hide the selection handles on tap event (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added unit test Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/input/touch_selection_controller.h" 5 #include "content/browser/renderer_host/input/touch_selection_controller.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "third_party/WebKit/public/web/WebInputEvent.h" 9 #include "third_party/WebKit/public/web/WebInputEvent.h"
10 10
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 130
131 void TouchSelectionController::OnLongPressEvent() { 131 void TouchSelectionController::OnLongPressEvent() {
132 response_pending_input_event_ = LONG_PRESS; 132 response_pending_input_event_ = LONG_PRESS;
133 ShowSelectionHandlesAutomatically(); 133 ShowSelectionHandlesAutomatically();
134 ShowInsertionHandleAutomatically(); 134 ShowInsertionHandleAutomatically();
135 ResetCachedValuesIfInactive(); 135 ResetCachedValuesIfInactive();
136 } 136 }
137 137
138 void TouchSelectionController::OnTapEvent() { 138 void TouchSelectionController::OnTapEvent() {
139 response_pending_input_event_ = TAP; 139 response_pending_input_event_ = TAP;
140 activate_selection_automatically_ = false;
141 DeactivateSelection();
142 ShowInsertionHandleAutomatically(); 140 ShowInsertionHandleAutomatically();
143 ResetCachedValuesIfInactive(); 141 ResetCachedValuesIfInactive();
144 } 142 }
145 143
146 void TouchSelectionController::HideAndDisallowShowingAutomatically() { 144 void TouchSelectionController::HideAndDisallowShowingAutomatically() {
147 response_pending_input_event_ = INPUT_EVENT_TYPE_NONE; 145 response_pending_input_event_ = INPUT_EVENT_TYPE_NONE;
148 DeactivateInsertion(); 146 DeactivateInsertion();
149 DeactivateSelection(); 147 DeactivateSelection();
150 activate_insertion_automatically_ = false; 148 activate_insertion_automatically_ = false;
151 activate_selection_automatically_ = false; 149 activate_selection_automatically_ = false;
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 } 391 }
394 392
395 TouchHandle::AnimationStyle TouchSelectionController::GetAnimationStyle( 393 TouchHandle::AnimationStyle TouchSelectionController::GetAnimationStyle(
396 bool was_active) const { 394 bool was_active) const {
397 return was_active && client_->SupportsAnimation() 395 return was_active && client_->SupportsAnimation()
398 ? TouchHandle::ANIMATION_SMOOTH 396 ? TouchHandle::ANIMATION_SMOOTH
399 : TouchHandle::ANIMATION_NONE; 397 : TouchHandle::ANIMATION_NONE;
400 } 398 }
401 399
402 } // namespace content 400 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698