Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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; | 140 activate_selection_automatically_ = false; |
| 141 DeactivateSelection(); | 141 DeactivateSelection(); |
| 142 ShowInsertionHandleAutomatically(); | 142 ShowInsertionHandleAutomatically(); |
| 143 if (selection_empty_) { | |
| 144 DeactivateInsertion(); | |
|
jdduke (slow)
2014/08/18 17:08:33
Nit: No need for braces. Also, please add a unit t
AKVT
2014/08/18 18:18:21
Done. Thanks
| |
| 145 } | |
| 143 ResetCachedValuesIfInactive(); | 146 ResetCachedValuesIfInactive(); |
| 144 } | 147 } |
| 145 | 148 |
| 146 void TouchSelectionController::HideAndDisallowShowingAutomatically() { | 149 void TouchSelectionController::HideAndDisallowShowingAutomatically() { |
| 147 response_pending_input_event_ = INPUT_EVENT_TYPE_NONE; | 150 response_pending_input_event_ = INPUT_EVENT_TYPE_NONE; |
| 148 DeactivateInsertion(); | 151 DeactivateInsertion(); |
| 149 DeactivateSelection(); | 152 DeactivateSelection(); |
| 150 activate_insertion_automatically_ = false; | 153 activate_insertion_automatically_ = false; |
| 151 activate_selection_automatically_ = false; | 154 activate_selection_automatically_ = false; |
| 152 } | 155 } |
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 393 } | 396 } |
| 394 | 397 |
| 395 TouchHandle::AnimationStyle TouchSelectionController::GetAnimationStyle( | 398 TouchHandle::AnimationStyle TouchSelectionController::GetAnimationStyle( |
| 396 bool was_active) const { | 399 bool was_active) const { |
| 397 return was_active && client_->SupportsAnimation() | 400 return was_active && client_->SupportsAnimation() |
| 398 ? TouchHandle::ANIMATION_SMOOTH | 401 ? TouchHandle::ANIMATION_SMOOTH |
| 399 : TouchHandle::ANIMATION_NONE; | 402 : TouchHandle::ANIMATION_NONE; |
| 400 } | 403 } |
| 401 | 404 |
| 402 } // namespace content | 405 } // namespace content |
| OLD | NEW |