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

Unified Diff: content/browser/renderer_host/input/touch_emulator.cc

Issue 2869823003: [VSync Queue] Plug touch ack to gesture events and flush vsync queue if necessary (Closed)
Patch Set: Use seperate bool for set_non_blocking Created 3 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/input/touch_emulator.cc
diff --git a/content/browser/renderer_host/input/touch_emulator.cc b/content/browser/renderer_host/input/touch_emulator.cc
index c7ec22f1a9203cfb7620ee163cd8c091bcdda889..d9849138d6141b4dae5736ef16e7905fdbda47b7 100644
--- a/content/browser/renderer_host/input/touch_emulator.cc
+++ b/content/browser/renderer_host/input/touch_emulator.cc
@@ -6,6 +6,7 @@
#include "build/build_config.h"
#include "content/browser/renderer_host/input/motion_event_web.h"
+#include "content/browser/renderer_host/ui_events_helper.h"
#include "content/common/input/web_touch_event_traits.h"
#include "content/grit/content_resources.h"
#include "content/public/common/content_client.h"
@@ -255,10 +256,12 @@ void TouchEmulator::HandleEmulatedTouchEvent(blink::WebTouchEvent event) {
return;
const bool event_consumed = true;
+ const bool is_source_touch_event_set_non_blocking = false;
// Block emulated event when emulated native stream is active.
if (native_stream_active_sequence_count_) {
gesture_provider_->OnTouchEventAck(event.unique_touch_event_id,
- event_consumed);
+ event_consumed,
+ is_source_touch_event_set_non_blocking);
return;
}
@@ -266,7 +269,8 @@ void TouchEmulator::HandleEmulatedTouchEvent(blink::WebTouchEvent event) {
// Do not allow middle-sequence event to pass through, if start was blocked.
if (!emulated_stream_active_sequence_count_ && !is_sequence_start) {
gesture_provider_->OnTouchEventAck(event.unique_touch_event_id,
- event_consumed);
+ event_consumed,
+ is_source_touch_event_set_non_blocking);
return;
}
@@ -286,8 +290,9 @@ bool TouchEmulator::HandleTouchEventAck(
const bool event_consumed = ack_result == INPUT_EVENT_ACK_STATE_CONSUMED;
if (gesture_provider_)
- gesture_provider_->OnTouchEventAck(event.unique_touch_event_id,
- event_consumed);
+ gesture_provider_->OnTouchEventAck(
+ event.unique_touch_event_id, event_consumed,
+ InputEventAckStateIsSetNonBlocking(ack_result));
return true;
}

Powered by Google App Engine
This is Rietveld 408576698