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

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

Issue 2867693004: Snapshot of all changes to get jumbo in blink and content.
Patch Set: Exclude certain files from jumbo because of a Windows problem Created 3 years, 3 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/legacy_touch_event_queue.cc
diff --git a/content/browser/renderer_host/input/legacy_touch_event_queue.cc b/content/browser/renderer_host/input/legacy_touch_event_queue.cc
index 79e27c4f086e5bb420f4c4c0155b8d8baa2be1ef..19f8fa067b370518efe50134654eb668d07209b7 100644
--- a/content/browser/renderer_host/input/legacy_touch_event_queue.cc
+++ b/content/browser/renderer_host/input/legacy_touch_event_queue.cc
@@ -28,8 +28,9 @@ namespace {
// scrolling is active and possible.
const double kAsyncTouchMoveIntervalSec = .2;
+ // FIXME: Identical HasPointChanged in passthrough_touch_event_queue()
// Compare all properties of touch points to determine the state.
-bool HasPointChanged(const WebTouchPoint& point_1,
+bool HasPointChangedLegacy(const WebTouchPoint& point_1,
const WebTouchPoint& point_2) {
DCHECK_EQ(point_1.id, point_2.id);
if (point_1.PositionInScreen() != point_2.PositionInScreen() ||
@@ -526,7 +527,7 @@ void LegacyTouchEventQueue::SendTouchEventImmediately(
if (current_touchmove_point.id != last_touch_point.id)
continue;
- if (!HasPointChanged(last_touch_point, current_touchmove_point))
+ if (!HasPointChangedLegacy(last_touch_point, current_touchmove_point))
touch->event.touches[j].state = WebTouchPoint::kStateStationary;
break;
@@ -622,7 +623,7 @@ LegacyTouchEventQueue::FilterBeforeForwarding(const WebTouchEvent& event) {
// All pointers in TouchMove events may have state as StateMoved,
// even though none of the pointers have not changed in real.
// Forward these events when at least one pointer has changed.
- if (HasPointChanged(last_sent_touchevent_->touches[j], point))
+ if (HasPointChangedLegacy(last_sent_touchevent_->touches[j], point))
return FORWARD_TO_RENDERER;
// This is a TouchMove event for which we have yet to find a

Powered by Google App Engine
This is Rietveld 408576698