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

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

Issue 2953563002: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/renderer_host/render_widget_host_view_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f0e3f01b960cfab34083c501d3cdd379ba3ecea8..4f6eb86e3eea8723f5d158c952e0b9b2d6f39624 100644
--- a/content/browser/renderer_host/input/touch_emulator.cc
+++ b/content/browser/renderer_host/input/touch_emulator.cc
@@ -6,7 +6,6 @@
#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"
@@ -259,12 +258,10 @@
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,
- is_source_touch_event_set_non_blocking);
+ event_consumed);
return;
}
@@ -272,8 +269,7 @@
// 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,
- is_source_touch_event_set_non_blocking);
+ event_consumed);
return;
}
@@ -293,9 +289,8 @@
const bool event_consumed = ack_result == INPUT_EVENT_ACK_STATE_CONSUMED;
if (gesture_provider_)
- gesture_provider_->OnTouchEventAck(
- event.unique_touch_event_id, event_consumed,
- InputEventAckStateIsSetNonBlocking(ack_result));
+ gesture_provider_->OnTouchEventAck(event.unique_touch_event_id,
+ event_consumed);
return true;
}
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/renderer_host/render_widget_host_view_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698