Remove WebTouchEvent.targetTouches

Source/web/WebInputEventConversion.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 723 matching lines @@
     nativeKeyCode = event.nativeVirtualKeyCode();
 
     windowsKeyCode = windowsKeyCodeWithoutLocation(event.windowsVirtualKeyCode());
     modifiers |= locationModifiersFromWindowsKeyCode(event.windowsVirtualKeyCode());
 
     event.text().copyTo(text, 0, textLengthCap);
     event.unmodifiedText().copyTo(unmodifiedText, 0, textLengthCap);
     memcpy(keyIdentifier, event.keyIdentifier().ascii().data(), std::min(static_cast<unsigned>(keyIdentifierLengthCap), event.keyIdentifier().length()));
 }
 
-static void addTouchPoints(const Widget* widget, const AtomicString& touchType, TouchList* touches, WebTouchPoint* touchPoints, unsigned* touchPointsLength, const RenderObject* renderObject)
+static WebTouchPoint toWebTouchPoint(const Touch* touch, const RenderObject* renderObject, WebTouchPoint::State state)
 {
-    unsigned numberOfTouches = std::min(touches->length(), static_cast<unsigned>(WebTouchEvent::touchesLengthCap));
-    for (unsigned i = 0; i < numberOfTouches; ++i) {
+    WebTouchPoint point;
+    point.id = touch->identifier();
+    point.screenPosition = touch->screenLocation();
+    point.position = convertAbsoluteLocationForRenderObjectFloat(touch->absoluteLocation(), *renderObject);
+    point.radiusX = touch->radiusX();
+    point.radiusY = touch->radiusY();
+    point.rotationAngle = touch->webkitRotationAngle();
+    point.force = touch->force();
+    point.state = state;
+    return point;
+}
+
+static bool hasTouchPointWithId(const WebTouchPoint* touchPoints, unsigned touchPointsLength, unsigned id)
+{
+    for (unsigned i = 0; i < touchPointsLength; ++i) {
+        if (touchPoints[i].id == static_cast<int>(id))
+            return true;
+    }
+    return false;
+}
+
+static void addTouchPointsIfNotYetAdded(const Widget* widget, WebTouchPoint::State state, TouchList* touches, WebTouchPoint* touchPoints, unsigned* touchPointsLength, const RenderObject* renderObject)
+{
+    unsigned initialTouchPointsLength = *touchPointsLength;
+    for (unsigned i = 0; i < touches->length(); ++i) {
+        const unsigned pointIndex = *touchPointsLength;
+        if (pointIndex >= static_cast<unsigned>(WebTouchEvent::touchesLengthCap))
+            return;
+
         const Touch* touch = touches->item(i);
+        if (hasTouchPointWithId(touchPoints, initialTouchPointsLength, touch->identifier()))
+            continue;
 
-        WebTouchPoint point;
-        point.id = touch->identifier();
-        point.screenPosition = touch->screenLocation();
-        point.position = convertAbsoluteLocationForRenderObjectFloat(touch->absoluteLocation(), *renderObject);
-        point.radiusX = touch->radiusX();
-        point.radiusY = touch->radiusY();
-        point.rotationAngle = touch->webkitRotationAngle();
-        point.force = touch->force();
-        point.state = toWebTouchPointState(touchType);
-
-        touchPoints[i] = point;
+        touchPoints[pointIndex] = toWebTouchPoint(touch, renderObject, state);
+        ++(*touchPointsLength);
     }
-    *touchPointsLength = numberOfTouches;
 }
 
 WebTouchEventBuilder::WebTouchEventBuilder(const Widget* widget, const RenderObject* renderObject, const TouchEvent& event)
 {
     if (event.type() == EventTypeNames::touchstart)
         type = TouchStart;
     else if (event.type() == EventTypeNames::touchmove)
         type = TouchMove;
     else if (event.type() == EventTypeNames::touchend)
         type = TouchEnd;
     else if (event.type() == EventTypeNames::touchcancel)
         type = TouchCancel;
     else {
         ASSERT_NOT_REACHED();
         type = Undefined;
         return;
     }
 
     modifiers = getWebInputModifiers(event);
     timeStampSeconds = event.timeStamp() / millisPerSecond;
     cancelable = event.cancelable();
 
-    addTouchPoints(widget, event.type(), event.touches(), touches, &touchesLength, renderObject);
-    addTouchPoints(widget, event.type(), event.changedTouches(), changedTouches, &changedTouchesLength, renderObject);
-    addTouchPoints(widget, event.type(), event.targetTouches(), targetTouches, &targetTouchesLength, renderObject);
+    addTouchPointsIfNotYetAdded(widget, toWebTouchPointState(event.type()), event.changedTouches(), touches, &touchesLength, renderObject);
+    addTouchPointsIfNotYetAdded(widget, WebTouchPoint::StateStationary, event.touches(), touches, &touchesLength, renderObject);
 }
 
 WebGestureEventBuilder::WebGestureEventBuilder(const Widget* widget, const RenderObject* renderObject, const GestureEvent& event)
 {
     if (event.type() == EventTypeNames::gestureshowpress)
         type = GestureShowPress;
     else if (event.type() == EventTypeNames::gesturetapdown)
         type = GestureTapDown;
     else if (event.type() == EventTypeNames::gesturescrollstart)
         type = GestureScrollBegin;
@@ skipping 12 matching lines @@
     modifiers = getWebInputModifiers(event);
 
     globalX = event.screenX();
     globalY = event.screenY();
     IntPoint localPoint = convertAbsoluteLocationForRenderObject(event.absoluteLocation(), *renderObject);
     x = localPoint.x();
     y = localPoint.y();
 }
 
 } // namespace blink