touch: Fix touch-event hit-testing for multiple touch points.

content/renderer/render_widget.cc

 // Copyright (c) 2012 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/renderer/render_widget.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 79 matching lines @@
 using blink::WebPagePopup;
 using blink::WebPopupMenu;
 using blink::WebPopupMenuInfo;
 using blink::WebPopupType;
 using blink::WebRange;
 using blink::WebRect;
 using blink::WebScreenInfo;
 using blink::WebSize;
 using blink::WebTextDirection;
 using blink::WebTouchEvent;
+using blink::WebTouchPoint;
 using blink::WebVector;
 using blink::WebWidget;
 
 namespace {
 
 typedef std::map<std::string, ui::TextInputMode> TextInputModeMap;
 
 class TextInputModeMapSingleton {
  public:
   static TextInputModeMapSingleton* GetInstance() {
@@ skipping 998 matching lines @@
   // it's not processed by webkit, then we need to suppress the upcoming Char
   // events.
   if (!processed && is_keyboard_shortcut)
     suppress_next_char_events_ = true;
 
   InputEventAckState ack_result = processed ?
       INPUT_EVENT_ACK_STATE_CONSUMED : INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
   if (!processed &&  input_event->type == WebInputEvent::TouchStart) {
     const WebTouchEvent& touch_event =
         *static_cast<const WebTouchEvent*>(input_event);
-    ack_result = HasTouchEventHandlersAt(touch_event.touches[0].position) ?
-        INPUT_EVENT_ACK_STATE_NOT_CONSUMED :
-        INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS;
+    // Hit-test for all the pressed touch points. If there is a touch-handler
+    // for any of the touch points, then the renderer should continue to receive
+    // touch events.
+    ack_result = INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS;
+    for (unsigned i = 0; i < touch_event.touchesLength; ++i) {
+      if (touch_event.touches[i].state == WebTouchPoint::StatePressed &&
+          HasTouchEventHandlersAt(touch_event.touches[i].position)) {
+        ack_result = INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
+        break;
+      }
+    }
   }
 
   IPC::Message* response =
       new InputHostMsg_HandleInputEvent_ACK(routing_id_,
                                             input_event->type,
                                             ack_result,
                                             latency_info);
   bool event_type_can_be_rate_limited =
       input_event->type == WebInputEvent::MouseMove ||
       input_event->type == WebInputEvent::MouseWheel ||
@@ skipping 1683 matching lines @@
           GetURLForGraphicsContext3D(),
           gpu_channel_host.get(),
           use_echo_for_swap_ack,
           attributes,
           false /* bind generates resources */,
           limits));
   return context.Pass();
 }
 
 }  // namespace content