Type->String helper function added to WebInputEvent.

content/browser/renderer_host/input/gesture_event_queue.cc

 // Copyright 2014 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/gesture_event_queue.h"
 
 #include "base/trace_event/trace_event.h"
 #include "content/browser/renderer_host/input/touchpad_tap_suppression_controller.h"
 #include "content/browser/renderer_host/input/touchscreen_tap_suppression_controller.h"
 #include "content/common/input/web_input_event_traits.h"
 
 using blink::WebGestureEvent;
 using blink::WebInputEvent;
 
 namespace content {
 namespace {
 
 // Whether |event_in_queue| is GesturePinchUpdate or GestureScrollUpdate and
 // has the same modifiers/source as the new scroll/pinch event. Compatible
 // scroll and pinch event pairs can be logically coalesced.
 bool IsCompatibleScrollorPinch(
     const GestureEventWithLatencyInfo& new_event,
     const GestureEventWithLatencyInfo& event_in_queue) {
   DCHECK(new_event.event.type == WebInputEvent::GestureScrollUpdate ||
          new_event.event.type == WebInputEvent::GesturePinchUpdate)
       << "Invalid event type for pinch/scroll coalescing: "
-      << WebInputEventTraits::GetName(new_event.event.type);
+      << WebInputEvent::GetName(new_event.event.type);
   DLOG_IF(WARNING, new_event.event.timeStampSeconds <
                        event_in_queue.event.timeStampSeconds)
       << "Event time not monotonic?\n";
   return (event_in_queue.event.type == WebInputEvent::GestureScrollUpdate ||
           event_in_queue.event.type == WebInputEvent::GesturePinchUpdate) &&
          event_in_queue.event.modifiers == new_event.event.modifiers &&
          event_in_queue.event.sourceDevice == new_event.event.sourceDevice;
 }
 
 // Returns the transform matrix corresponding to the gesture event.
 gfx::Transform GetTransformForEvent(
     const GestureEventWithLatencyInfo& gesture_event) {
   gfx::Transform gesture_transform;
   if (gesture_event.event.type == WebInputEvent::GestureScrollUpdate) {
     gesture_transform.Translate(gesture_event.event.data.scrollUpdate.deltaX,
                                 gesture_event.event.data.scrollUpdate.deltaY);
   } else if (gesture_event.event.type == WebInputEvent::GesturePinchUpdate) {
     float scale = gesture_event.event.data.pinchUpdate.scale;
     gesture_transform.Translate(-gesture_event.event.x, -gesture_event.event.y);
     gesture_transform.Scale(scale, scale);
     gesture_transform.Translate(gesture_event.event.x, gesture_event.event.y);
   } else {
     NOTREACHED() << "Invalid event type for transform retrieval: "
-                 << WebInputEventTraits::GetName(gesture_event.event.type);
+                 << WebInputEvent::GetName(gesture_event.event.type);
   }
   return gesture_transform;
 }
 
 }  // namespace
 
 GestureEventQueue::Config::Config() {
 }
 
 GestureEventQueue::GestureEventQueue(
@@ skipping 349 matching lines @@
     return 0;
 
   if (!ignore_next_ack_)
     return 1;
 
   DCHECK_GT(coalesced_gesture_events_.size(), 1U);
   return 2;
 }
 
 }  // namespace content