Update call sites to account for new WebTouchEvent API.

chrome/browser/renderer_host/render_widget_host_view_views_touch.cc

 // Copyright (c) 2011 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 "chrome/browser/renderer_host/render_widget_host_view_views.h"
 
 #include "base/logging.h"
 #include "chrome/browser/renderer_host/accelerated_surface_container_touch.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFactory.h"
@@ skipping 70 matching lines @@
   if (!host_)
     return ui::TOUCH_STATUS_UNKNOWN;
 
   // Update the list of touch points first.
   WebKit::WebTouchPoint* point = NULL;
   ui::TouchStatus status = ui::TOUCH_STATUS_UNKNOWN;
 
   switch (event.type()) {
     case ui::ET_TOUCH_PRESSED:
       // Add a new touch point.
-      if (touch_event_.touchPointsLength <
-          WebTouchEvent::touchPointsLengthCap) {
-        point = &touch_event_.touchPoints[touch_event_.touchPointsLength++];
+      if (touch_event_.touchesLength <
+          WebTouchEvent::touchesLengthCap) {
+        point = &touch_event_.touches[touch_event_.touchesLength++];
         point->id = event.identity();
 
-        if (touch_event_.touchPointsLength == 1) {
+        if (touch_event_.touchesLength == 1) {
           // A new touch sequence has started.
           status = ui::TOUCH_STATUS_START;
 
           // We also want the focus.
           RequestFocus();
 
           // Confirm existing composition text on touch press events, to make
           // sure the input caret won't be moved with an ongoing composition
           // text.
           FinishImeCompositionSession();
         }
       }
       break;
     case ui::ET_TOUCH_RELEASED:
     case ui::ET_TOUCH_CANCELLED:
     case ui::ET_TOUCH_MOVED: {
       // The touch point should have been added to the event from an earlier
       // _PRESSED event. So find that.
       // At the moment, only a maximum of 4 touch-points are allowed. So a
       // simple loop should be sufficient.
-      for (int i = 0; i < touch_event_.touchPointsLength; ++i) {
-        point = touch_event_.touchPoints + i;
+      for (int i = 0; i < touch_event_.touchesLength; ++i) {
+        point = touch_event_.touches + i;
         if (point->id == event.identity()) {
           break;
         }
         point = NULL;
       }
       break;
     }
     default:
       DLOG(WARNING) << "Unknown touch event " << event.type();
       break;
@@ skipping 13 matching lines @@
     // It is possible for badly written touch drivers to emit Move events even
     // when the touch location hasn't changed. In such cases, consume the event
     // and pretend nothing happened.
     if (point->position.x == event.x() && point->position.y == event.y()) {
       return status;
     }
   }
   UpdateTouchPointPosition(&event, GetMirroredPosition(), point);
 
   // Mark the rest of the points as stationary.
-  for (int i = 0; i < touch_event_.touchPointsLength; ++i) {
-    WebKit::WebTouchPoint* iter = touch_event_.touchPoints + i;
+  for (int i = 0; i < touch_event_.touchesLength; ++i) {
+    WebKit::WebTouchPoint* iter = touch_event_.touches + i;
     if (iter != point) {
       iter->state = WebKit::WebTouchPoint::StateStationary;
     }
   }
 
   // Update the type of the touch event.
   touch_event_.type = TouchEventTypeFromEvent(&event);
   touch_event_.timeStampSeconds = base::Time::Now().ToDoubleT();
 
   // The event and all the touches have been updated. Dispatch.
   host_->ForwardTouchEvent(touch_event_);
 
   // If the touch was released, then remove it from the list of touch points.
   if (event.type() == ui::ET_TOUCH_RELEASED) {
-    --touch_event_.touchPointsLength;
-    for (int i = point - touch_event_.touchPoints;
-         i < touch_event_.touchPointsLength;
+    --touch_event_.touchesLength;
+    for (int i = point - touch_event_.touches;
+         i < touch_event_.touchesLength;
          ++i) {
-      touch_event_.touchPoints[i] = touch_event_.touchPoints[i + 1];
+      touch_event_.touches[i] = touch_event_.touches[i + 1];
     }
-    if (touch_event_.touchPointsLength == 0)
+    if (touch_event_.touchesLength == 0)
       status = ui::TOUCH_STATUS_END;
   } else if (event.type() == ui::ET_TOUCH_CANCELLED) {
     status = ui::TOUCH_STATUS_CANCEL;
   }
 
   return status;
 }
 
 gfx::PluginWindowHandle RenderWidgetHostViewViews::GetCompositingSurface() {
   // On TOUCH_UI builds, the GPU process renders to an offscreen surface
@@ skipping 12 matching lines @@
 
 void RenderWidgetHostViewViews::AcceleratedSurfaceRelease(uint64 surface_id) {
   accelerated_surface_containers_.erase(surface_id);
 }
 
 void RenderWidgetHostViewViews::AcceleratedSurfaceBuffersSwapped(
     uint64 surface_id) {
   SetExternalTexture(accelerated_surface_containers_[surface_id].get());
   glFlush();
 }