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

third_party/WebKit/Source/web/WebInputEventConversion.cpp

 /*
  * Copyright (C) 2009 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
@@ skipping 270 matching lines @@
     case WebGestureDeviceTouchscreen:
         m_source = PlatformGestureSourceTouchscreen;
         break;
     case WebGestureDeviceUninitialized:
         ASSERT_NOT_REACHED();
     }
 }
 
 // MakePlatformKeyboardEvent --------------------------------------------------
 
-inline PlatformEvent::Type toPlatformKeyboardEventType(WebInputEvent::Type type)
+inline PlatformEvent::EventType toPlatformKeyboardEventType(WebInputEvent::Type type)
 {
     switch (type) {
     case WebInputEvent::KeyUp:
         return PlatformEvent::KeyUp;
     case WebInputEvent::KeyDown:
         return PlatformEvent::KeyDown;
     case WebInputEvent::RawKeyDown:
         return PlatformEvent::RawKeyDown;
     case WebInputEvent::Char:
         return PlatformEvent::Char;
@@ skipping 13 matching lines @@
     m_isSystemKey = e.isSystemKey;
     // TODO: BUG482880 Fix this initialization to lazy initialization.
     m_code = Platform::current()->domCodeStringFromEnum(e.domCode);
     m_key = Platform::current()->domKeyStringFromEnum(e.domKey);
 
     m_modifiers = e.modifiers;
     m_timestamp = e.timeStampSeconds;
     m_windowsVirtualKeyCode = e.windowsKeyCode;
 }
 
-void PlatformKeyboardEventBuilder::setKeyType(Type type)
+void PlatformKeyboardEventBuilder::setKeyType(EventType type)
 {
     // According to the behavior of Webkit in Windows platform,
     // we need to convert KeyDown to RawKeydown and Char events
     // See WebKit/WebKit/Win/WebView.cpp
     ASSERT(m_type == KeyDown);
     ASSERT(type == RawKeyDown || type == Char);
     m_type = type;
 
     if (type == RawKeyDown) {
         m_text = String();
@@ skipping 10 matching lines @@
 bool PlatformKeyboardEventBuilder::isCharacterKey() const
 {
     switch (windowsVirtualKeyCode()) {
     case VKEY_BACK:
     case VKEY_ESCAPE:
         return false;
     }
     return true;
 }
 
-inline PlatformEvent::Type toPlatformTouchEventType(const WebInputEvent::Type type)
+inline PlatformEvent::EventType toPlatformTouchEventType(const WebInputEvent::Type type)
 {
     switch (type) {
     case WebInputEvent::TouchStart:
         return PlatformEvent::TouchStart;
     case WebInputEvent::TouchMove:
         return PlatformEvent::TouchMove;
     case WebInputEvent::TouchEnd:
         return PlatformEvent::TouchEnd;
     case WebInputEvent::TouchCancel:
         return PlatformEvent::TouchCancel;
     default:
         ASSERT_NOT_REACHED();
     }
     return PlatformEvent::TouchStart;
 }
 
-inline PlatformTouchPoint::State toPlatformTouchPointState(const WebTouchPoint::State state)
+inline PlatformTouchPoint::TouchState toPlatformTouchPointState(const WebTouchPoint::State state)
 {
     switch (state) {
     case WebTouchPoint::StateReleased:
         return PlatformTouchPoint::TouchReleased;
     case WebTouchPoint::StatePressed:
         return PlatformTouchPoint::TouchPressed;
     case WebTouchPoint::StateMoved:
         return PlatformTouchPoint::TouchMoved;
     case WebTouchPoint::StateStationary:
         return PlatformTouchPoint::TouchStationary;
@@ skipping 216 matching lines @@
     domCode = Platform::current()->domEnumFromCodeString(event.keyEvent()->code());
     domKey = Platform::current()->domKeyEnumFromString(event.keyEvent()->key());
     unsigned numberOfCharacters = std::min(event.keyEvent()->text().length(), static_cast<unsigned>(textLengthCap));
     for (unsigned i = 0; i < numberOfCharacters; ++i) {
         text[i] = event.keyEvent()->text()[i];
         unmodifiedText[i] = event.keyEvent()->unmodifiedText()[i];
     }
     memcpy(keyIdentifier, event.keyIdentifier().ascii().data(), event.keyIdentifier().length());
 }
 
-WebInputEvent::Type toWebKeyboardEventType(PlatformEvent::Type type)
+WebInputEvent::Type toWebKeyboardEventType(PlatformEvent::EventType type)
 {
     switch (type) {
     case PlatformEvent::KeyUp:
         return WebInputEvent::KeyUp;
     case PlatformEvent::KeyDown:
         return WebInputEvent::KeyDown;
     case PlatformEvent::RawKeyDown:
         return WebInputEvent::RawKeyDown;
     case PlatformEvent::Char:
         return WebInputEvent::Char;
@@ skipping 119 matching lines @@
         break;
     case GestureSourceTouchscreen:
         sourceDevice = WebGestureDeviceTouchscreen;
         break;
     case GestureSourceUninitialized:
         ASSERT_NOT_REACHED();
     }
 }
 
 } // namespace blink