Rename enums/functions that collide in chromium style in platform/

third_party/WebKit/Source/core/events/GestureEvent.cpp

 /*
  * Copyright (C) 2012 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 copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 69 matching lines @@
         velocityY = event.velocityY();
         break;
     case PlatformEvent::GestureTwoFingerTap:
     case PlatformEvent::GesturePinchBegin:
     case PlatformEvent::GesturePinchEnd:
     case PlatformEvent::GesturePinchUpdate:
     case PlatformEvent::GestureTapDownCancel:
     default:
         return nullptr;
     }
-    return adoptRefWillBeNoop(new GestureEvent(eventType, view, event.globalPosition().x(), event.globalPosition().y(), event.position().x(), event.position().y(), event.modifiers(), deltaX, deltaY, velocityX, velocityY, inertial, event.timestamp(), event.resendingPluginId(), source));
+    return adoptRefWillBeNoop(new GestureEvent(eventType, view, event.globalPosition().x(), event.globalPosition().y(), event.position().x(), event.position().y(), event.getModifiers(), deltaX, deltaY, velocityX, velocityY, inertial, event.timestamp(), event.resendingPluginId(), source));
 }
 
 const AtomicString& GestureEvent::interfaceName() const
 {
     // FIXME: when a GestureEvent.idl interface is defined, return the string "GestureEvent".
     // Until that happens, do not advertise an interface that does not exist, since it will
     // trip up the bindings integrity checks.
     return UIEvent::interfaceName();
 }
 
@@ skipping 24 matching lines @@
     , m_resendingPluginId(resendingPluginId)
 {
 }
 
 DEFINE_TRACE(GestureEvent)
 {
     MouseRelatedEvent::trace(visitor);
 }
 
 } // namespace blink