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

Side by Side Diff: ui/events/gestures/gesture_provider_aura.cc

Issue 2943883002: Revert of [VSync Queue] Plug touch ack to gesture events and flush vsync queue if necessary (Closed)
Patch Set: Created 3 years, 6 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
« no previous file with comments | « ui/events/gestures/gesture_provider_aura.h ('k') | ui/events/gestures/gesture_recognizer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ui/events/gestures/gesture_provider_aura.h" 5 #include "ui/events/gestures/gesture_provider_aura.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 24 matching lines...) Expand all
35 35
36 auto result = filtered_gesture_provider_.OnTouchEvent(pointer_state_); 36 auto result = filtered_gesture_provider_.OnTouchEvent(pointer_state_);
37 if (!result.succeeded) 37 if (!result.succeeded)
38 return false; 38 return false;
39 39
40 event->set_may_cause_scrolling(result.moved_beyond_slop_region); 40 event->set_may_cause_scrolling(result.moved_beyond_slop_region);
41 pointer_state_.CleanupRemovedTouchPoints(*event); 41 pointer_state_.CleanupRemovedTouchPoints(*event);
42 return true; 42 return true;
43 } 43 }
44 44
45 void GestureProviderAura::OnTouchEventAck( 45 void GestureProviderAura::OnTouchEventAck(uint32_t unique_touch_event_id,
46 uint32_t unique_touch_event_id, 46 bool event_consumed) {
47 bool event_consumed,
48 bool is_source_touch_event_set_non_blocking) {
49 DCHECK(pending_gestures_.empty()); 47 DCHECK(pending_gestures_.empty());
50 DCHECK(!handling_event_); 48 DCHECK(!handling_event_);
51 base::AutoReset<bool> handling_event(&handling_event_, true); 49 base::AutoReset<bool> handling_event(&handling_event_, true);
52 filtered_gesture_provider_.OnTouchEventAck( 50 filtered_gesture_provider_.OnTouchEventAck(unique_touch_event_id,
53 unique_touch_event_id, event_consumed, 51 event_consumed);
54 is_source_touch_event_set_non_blocking);
55 } 52 }
56 53
57 void GestureProviderAura::OnGestureEvent(const GestureEventData& gesture) { 54 void GestureProviderAura::OnGestureEvent(const GestureEventData& gesture) {
58 std::unique_ptr<ui::GestureEvent> event( 55 std::unique_ptr<ui::GestureEvent> event(
59 new ui::GestureEvent(gesture.x, gesture.y, gesture.flags, 56 new ui::GestureEvent(gesture.x, gesture.y, gesture.flags,
60 gesture.time, gesture.details, 57 gesture.time, gesture.details,
61 gesture.unique_touch_event_id)); 58 gesture.unique_touch_event_id));
62 59
63 if (!handling_event_) { 60 if (!handling_event_) {
64 // Dispatching event caused by timer. 61 // Dispatching event caused by timer.
(...skipping 13 matching lines...) Expand all
78 void GestureProviderAura::OnTouchEnter(int pointer_id, float x, float y) { 75 void GestureProviderAura::OnTouchEnter(int pointer_id, float x, float y) {
79 std::unique_ptr<TouchEvent> touch_event(new TouchEvent( 76 std::unique_ptr<TouchEvent> touch_event(new TouchEvent(
80 ET_TOUCH_PRESSED, gfx::Point(), ui::EventTimeForNow(), 77 ET_TOUCH_PRESSED, gfx::Point(), ui::EventTimeForNow(),
81 PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, pointer_id), 78 PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, pointer_id),
82 EF_IS_SYNTHESIZED, 0.0f)); 79 EF_IS_SYNTHESIZED, 0.0f));
83 gfx::PointF point(x, y); 80 gfx::PointF point(x, y);
84 touch_event->set_location_f(point); 81 touch_event->set_location_f(point);
85 touch_event->set_root_location_f(point); 82 touch_event->set_root_location_f(point);
86 83
87 OnTouchEvent(touch_event.get()); 84 OnTouchEvent(touch_event.get());
88 OnTouchEventAck(touch_event->unique_event_id(), true /* event_consumed */, 85 OnTouchEventAck(touch_event->unique_event_id(), true);
89 false /* is_source_touch_event_set_non_blocking */);
90 } 86 }
91 87
92 } // namespace content 88 } // namespace content
OLDNEW
« no previous file with comments | « ui/events/gestures/gesture_provider_aura.h ('k') | ui/events/gestures/gesture_recognizer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698