Snapshot of all changes to get jumbo in blink and content.

content/browser/renderer_host/input/legacy_touch_event_queue.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/input/legacy_touch_event_queue.h"
 
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "base/macros.h"
@@ skipping 10 matching lines @@
 using blink::WebTouchPoint;
 using ui::LatencyInfo;
 
 namespace content {
 namespace {
 
 // Time interval at which touchmove events will be forwarded to the client while
 // 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() ||
       point_1.PositionInWidget() != point_2.PositionInWidget() ||
       point_1.radius_x != point_2.radius_x ||
       point_1.radius_y != point_2.radius_y ||
       point_1.rotation_angle != point_2.rotation_angle ||
       point_1.force != point_2.force || point_1.tilt_x != point_2.tilt_x ||
       point_1.tilt_y != point_2.tilt_y) {
     return true;
@@ skipping 476 matching lines @@
     if (last_sent_touchevent_->GetType() == WebInputEvent::kTouchStart)
       touch->event.touch_start_or_first_touch_move = true;
     for (unsigned int i = 0; i < last_sent_touchevent_->touches_length; ++i) {
       const WebTouchPoint& last_touch_point = last_sent_touchevent_->touches[i];
       // Touches with same id may not have same index in Touches array.
       for (unsigned int j = 0; j < touch->event.touches_length; ++j) {
         const WebTouchPoint& current_touchmove_point = touch->event.touches[j];
         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;
       }
     }
   }
 
   if (touch->event.GetType() != WebInputEvent::kTouchScrollStarted) {
     if (last_sent_touchevent_)
       *last_sent_touchevent_ = touch->event;
@@ skipping 75 matching lines @@
       for (size_t j = 0; j < last_sent_touchevent_->touches_length; ++j) {
         if (point.id != last_sent_touchevent_->touches[j].id)
           continue;
 
         if (event.GetType() != WebInputEvent::kTouchMove)
           return FORWARD_TO_RENDERER;
 
         // 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
         // non-stationary pointer. Continue checking the next pointers
         // in the |event|.
         break;
       }
     }
   }
 
   return ACK_WITH_NO_CONSUMER_EXISTS;
 }
 
 void LegacyTouchEventQueue::UpdateTouchConsumerStates(
     const WebTouchEvent& event,
     InputEventAckState ack_result) {
   if (event.GetType() == WebInputEvent::kTouchStart) {
     if (ack_result == INPUT_EVENT_ACK_STATE_CONSUMED)
       send_touch_events_async_ = false;
     has_handler_for_current_sequence_ |=
         ack_result != INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS;
   } else if (WebTouchEventTraits::IsTouchSequenceEnd(event)) {
     has_handler_for_current_sequence_ = false;
   }
 }
 
 }  // namespace content