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

third_party/WebKit/Source/platform/PlatformKeyboardEvent.h

Index: third_party/WebKit/Source/platform/PlatformKeyboardEvent.h
diff --git a/third_party/WebKit/Source/platform/PlatformKeyboardEvent.h b/third_party/WebKit/Source/platform/PlatformKeyboardEvent.h
index a5f2dda1b4e2c13e14194c07a4e3ac39b1c391d0..0047caf552dd4f3f5c5c28cbd5dd0f0bf9b20d66 100644
--- a/third_party/WebKit/Source/platform/PlatformKeyboardEvent.h
+++ b/third_party/WebKit/Source/platform/PlatformKeyboardEvent.h
@@ -44,7 +44,7 @@ public:
     {
     }
 
-    PlatformKeyboardEvent(Type type, const String& text, const String& unmodifiedText, const String& keyIdentifier, const String& code, const String& key, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isSystemKey, Modifiers modifiers, double timestamp)
+    PlatformKeyboardEvent(EventType type, const String& text, const String& unmodifiedText, const String& keyIdentifier, const String& code, const String& key, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isSystemKey, Modifiers modifiers, double timestamp)
         : PlatformEvent(type, modifiers, timestamp)
         , m_text(text)
         , m_unmodifiedText(unmodifiedText)
@@ -57,7 +57,7 @@ public:
     {
     }
 
-    PLATFORM_EXPORT void disambiguateKeyDownEvent(Type);
+    PLATFORM_EXPORT void disambiguateKeyDownEvent(EventType);
 
     // Text as as generated by processing a virtual key code with a keyboard layout
     // (in most cases, just a character code, but the layout can emit several
@@ -83,8 +83,8 @@ public:
 
     int nativeVirtualKeyCode() const { return m_nativeVirtualKeyCode; }
 
-    bool isAutoRepeat() const { return modifiers() & IsAutoRepeat; }
-    bool isKeypad() const { return modifiers() & IsKeyPad; }
+    bool isAutoRepeat() const { return getModifiers() & IsAutoRepeat; }
+    bool isKeypad() const { return getModifiers() & IsKeyPad; }
     bool isSystemKey() const { return m_isSystemKey; }
 
     PLATFORM_EXPORT static bool currentCapsLockState();