Remove references to WebTouchEvent.targetTouches

content/renderer/browser_plugin/browser_plugin.cc

 // Copyright 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/browser_plugin/browser_plugin.h"
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 564 matching lines @@
     return false;
 
   if (event.type == blink::WebInputEvent::ContextMenu)
     return true;
 
   const blink::WebInputEvent* modified_event = &event;
   scoped_ptr<blink::WebTouchEvent> touch_event;
   if (blink::WebInputEvent::isTouchEventType(event.type)) {
     const blink::WebTouchEvent* orig_touch_event =
         static_cast<const blink::WebTouchEvent*>(&event);
+    // TODO(jdduke): Remove this branch when Blink starts forwarding
+    // WebTouchEvents with a fully populated |touches| field.
+    if (orig_touch_event->changedTouchesLength) {
+      touch_event.reset(new blink::WebTouchEvent());
+      memcpy(touch_event.get(), orig_touch_event, sizeof(blink::WebTouchEvent));
 
-    touch_event.reset(new blink::WebTouchEvent());
-    memcpy(touch_event.get(), orig_touch_event, sizeof(blink::WebTouchEvent));
+      if (touch_event->changedTouchesLength)

[bokan, 2014/09/09 20:17:38]

Nit: I should have done this when i was here...can you add curly braces around
this 'if'

[jdduke (slow), 2014/09/09 20:52:24]

Done.

+        // TODO(bokan): Blink passes back a WebGestureEvent with touches and
+        // changedTouches lists; however, it doesn't set the state field on the
+        // touches which is what the RenderWidget uses to create a
+        // WebCore::TouchEvent. crbug.com/358132 tracks removing these multiple
+        // from WebTouchEvent since they lead to misuse like this and are
+        // functionally unused. In the mean time we'll setup the state field
+        // here manually to fix multi-touch BrowserPlugins.
+        for (size_t i = 0; i < touch_event->touchesLength; ++i) {
+          blink::WebTouchPoint& touch = touch_event->touches[i];
+          touch.state = blink::WebTouchPoint::StateStationary;
+          for (size_t j = 0; j < touch_event->changedTouchesLength; ++j) {
+            blink::WebTouchPoint& changed_touch =
+                touch_event->changedTouches[j];
+            if (touch.id == changed_touch.id) {
+              touch.state = changed_touch.state;
+              break;
+            }
+          }
+        }
 
-    // TODO(bokan): Blink passes back a WebGestureEvent with a touches,
-    // changedTouches, and targetTouches lists; however, it doesn't set
-    // the state field on the touches which is what the RenderWidget uses
-    // to create a WebCore::TouchEvent. crbug.com/358132 tracks removing
-    // these multiple lists from WebTouchEvent since they lead to misuse
-    // like this and are functionally unused. In the mean time we'll setup
-    // the state field here manually to fix multi-touch BrowserPlugins.
-    for (size_t i = 0; i < touch_event->touchesLength; ++i) {
-      blink::WebTouchPoint& touch = touch_event->touches[i];
-      touch.state = blink::WebTouchPoint::StateStationary;
-      for (size_t j = 0; j < touch_event->changedTouchesLength; ++j) {
-        blink::WebTouchPoint& changed_touch = touch_event->changedTouches[j];
-        if (touch.id == changed_touch.id) {
-          touch.state = changed_touch.state;
-          break;
+      // For End and Cancel, Blink gives BrowserPlugin a list of touches that
+      // are down, but the browser process expects a list of all touches. We
+      // modify these events here to match these expectations.
+      if (event.type == blink::WebInputEvent::TouchEnd ||
+          event.type == blink::WebInputEvent::TouchCancel) {
+        if (touch_event->changedTouchesLength > 0) {
+          memcpy(
+              &touch_event->touches[touch_event->touchesLength],
+              &touch_event->changedTouches,
+              touch_event->changedTouchesLength * sizeof(blink::WebTouchPoint));
+          touch_event->touchesLength += touch_event->changedTouchesLength;
         }
       }
+      modified_event = touch_event.get();
     }
-
-    // For End and Cancel, Blink gives BrowserPlugin a list of touches that
-    // are down, but the browser process expects a list of all touches. We
-    // modify these events here to match these expectations.
-    if (event.type == blink::WebInputEvent::TouchEnd ||
-        event.type == blink::WebInputEvent::TouchCancel) {
-      if (touch_event->changedTouchesLength > 0) {
-        memcpy(&touch_event->touches[touch_event->touchesLength],
-               &touch_event->changedTouches,
-              touch_event->changedTouchesLength * sizeof(blink::WebTouchPoint));
-        touch_event->touchesLength += touch_event->changedTouchesLength;
-      }
-    }
-    modified_event = touch_event.get();
   }
 
   if (blink::WebInputEvent::isKeyboardEventType(event.type) &&
       !edit_commands_.empty()) {
     browser_plugin_manager()->Send(
         new BrowserPluginHostMsg_SetEditCommandsForNextKeyEvent(
             render_view_routing_id_,
             browser_plugin_instance_id_,
             edit_commands_));
     edit_commands_.clear();
@@ skipping 137 matching lines @@
     const blink::WebMouseEvent& event) {
   browser_plugin_manager()->Send(
       new BrowserPluginHostMsg_HandleInputEvent(render_view_routing_id_,
                                                 browser_plugin_instance_id_,
                                                 plugin_rect_,
                                                 &event));
   return true;
 }
 
 }  // namespace content