| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/web_contents/touch_editable_impl_aura.h" | 5 #include "content/browser/web_contents/touch_editable_impl_aura.h" |
| 6 | 6 |
| 7 #include "content/browser/renderer_host/render_widget_host_impl.h" | 7 #include "content/browser/renderer_host/render_widget_host_impl.h" |
| 8 #include "content/browser/renderer_host/render_widget_host_view_aura.h" | 8 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
| 9 #include "content/common/view_messages.h" | 9 #include "content/common/view_messages.h" |
| 10 #include "content/public/browser/render_widget_host.h" | 10 #include "content/public/browser/render_widget_host.h" |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 scroll_in_progress_ = false; | 188 scroll_in_progress_ = false; |
| 189 break; | 189 break; |
| 190 default: | 190 default: |
| 191 break; | 191 break; |
| 192 } | 192 } |
| 193 return false; | 193 return false; |
| 194 } | 194 } |
| 195 | 195 |
| 196 void TouchEditableImplAura::GestureEventAck(int gesture_event_type) { | 196 void TouchEditableImplAura::GestureEventAck(int gesture_event_type) { |
| 197 DCHECK(rwhva_); | 197 DCHECK(rwhva_); |
| 198 if (gesture_event_type == WebKit::WebInputEvent::GestureTap && | 198 if (gesture_event_type == blink::WebInputEvent::GestureTap && |
| 199 text_input_type_ != ui::TEXT_INPUT_TYPE_NONE && | 199 text_input_type_ != ui::TEXT_INPUT_TYPE_NONE && |
| 200 is_tap_on_focused_textfield_) { | 200 is_tap_on_focused_textfield_) { |
| 201 StartTouchEditing(); | 201 StartTouchEditing(); |
| 202 if (touch_selection_controller_) | 202 if (touch_selection_controller_) |
| 203 touch_selection_controller_->SelectionChanged(); | 203 touch_selection_controller_->SelectionChanged(); |
| 204 } | 204 } |
| 205 | 205 |
| 206 if (gesture_event_type == WebKit::WebInputEvent::GestureLongPress) | 206 if (gesture_event_type == blink::WebInputEvent::GestureLongPress) |
| 207 selection_gesture_in_process_ = false; | 207 selection_gesture_in_process_ = false; |
| 208 if (gesture_event_type == WebKit::WebInputEvent::GestureTap) { | 208 if (gesture_event_type == blink::WebInputEvent::GestureTap) { |
| 209 if (tap_gesture_tap_count_queue_.front() > 1) | 209 if (tap_gesture_tap_count_queue_.front() > 1) |
| 210 selection_gesture_in_process_ = false; | 210 selection_gesture_in_process_ = false; |
| 211 tap_gesture_tap_count_queue_.pop(); | 211 tap_gesture_tap_count_queue_.pop(); |
| 212 } | 212 } |
| 213 } | 213 } |
| 214 | 214 |
| 215 void TouchEditableImplAura::OnViewDestroyed() { | 215 void TouchEditableImplAura::OnViewDestroyed() { |
| 216 Cleanup(); | 216 Cleanup(); |
| 217 } | 217 } |
| 218 | 218 |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 370 rwhva_ = NULL; | 370 rwhva_ = NULL; |
| 371 } | 371 } |
| 372 text_input_type_ = ui::TEXT_INPUT_TYPE_NONE; | 372 text_input_type_ = ui::TEXT_INPUT_TYPE_NONE; |
| 373 touch_selection_controller_.reset(); | 373 touch_selection_controller_.reset(); |
| 374 handles_hidden_due_to_scroll_ = false; | 374 handles_hidden_due_to_scroll_ = false; |
| 375 scroll_in_progress_ = false; | 375 scroll_in_progress_ = false; |
| 376 overscroll_in_progress_ = false; | 376 overscroll_in_progress_ = false; |
| 377 } | 377 } |
| 378 | 378 |
| 379 } // namespace content | 379 } // namespace content |
| OLD | NEW |