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

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

 /**
  * Copyright (C) 2001 Peter Kelly (pmk@post.com)
  * Copyright (C) 2001 Tobias Anton (anton@stud.fbi.fh-darmstadt.de)
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2003, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 11 matching lines @@
 
 #include "core/events/KeyboardEvent.h"
 
 #include "bindings/core/v8/DOMWrapperWorld.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "platform/PlatformKeyboardEvent.h"
 #include "platform/WindowsKeyboardCodes.h"
 
 namespace blink {
 
-static inline const AtomicString& eventTypeForKeyboardEventType(PlatformEvent::Type type)
+static inline const AtomicString& eventTypeForKeyboardEventType(PlatformEvent::EventType type)
 {
     switch (type) {
         case PlatformEvent::KeyUp:
             return EventTypeNames::keyup;
         case PlatformEvent::RawKeyDown:
             return EventTypeNames::keydown;
         case PlatformEvent::Char:
             return EventTypeNames::keypress;
         case PlatformEvent::KeyDown:
             // The caller should disambiguate the combined event into RawKeyDown or Char events.
             break;
         default:
             break;
     }
     ASSERT_NOT_REACHED();
     return EventTypeNames::keydown;
 }
 
 static inline KeyboardEvent::KeyLocationCode keyLocationCode(const PlatformKeyboardEvent& key)
 {
     if (key.isKeypad())
         return KeyboardEvent::DOM_KEY_LOCATION_NUMPAD;
-    if (key.modifiers() & PlatformEvent::IsLeft)
+    if (key.getModifiers() & PlatformEvent::IsLeft)
         return KeyboardEvent::DOM_KEY_LOCATION_LEFT;
-    if (key.modifiers() & PlatformEvent::IsRight)
+    if (key.getModifiers() & PlatformEvent::IsRight)
         return KeyboardEvent::DOM_KEY_LOCATION_RIGHT;
     return KeyboardEvent::DOM_KEY_LOCATION_STANDARD;
 }
 
 PassRefPtrWillBeRawPtr<KeyboardEvent> KeyboardEvent::create(ScriptState* scriptState, const AtomicString& type, const KeyboardEventInit& initializer)
 {
     if (scriptState->world().isIsolatedWorld())
         UIEventWithKeyState::didCreateEventInIsolatedWorld(initializer.ctrlKey(), initializer.altKey(), initializer.shiftKey(), initializer.metaKey());
     return adoptRefWillBeNoop(new KeyboardEvent(type, initializer));
 }
 
 KeyboardEvent::KeyboardEvent()
     : m_location(DOM_KEY_LOCATION_STANDARD)
 {
 }
 
 KeyboardEvent::KeyboardEvent(const PlatformKeyboardEvent& key, AbstractView* view)
-    : UIEventWithKeyState(eventTypeForKeyboardEventType(key.type()), true, true, view, 0, key.modifiers(), key.timestamp(), InputDeviceCapabilities::doesntFireTouchEventsSourceCapabilities())
+    : UIEventWithKeyState(eventTypeForKeyboardEventType(key.type()), true, true, view, 0, key.getModifiers(), key.timestamp(), InputDeviceCapabilities::doesntFireTouchEventsSourceCapabilities())
     , m_keyEvent(adoptPtr(new PlatformKeyboardEvent(key)))
     , m_keyIdentifier(key.keyIdentifier())
     , m_code(key.code())
     , m_key(key.key())
     , m_location(keyLocationCode(key))
 {
     initLocationModifiers(m_location);
 }
 
 KeyboardEvent::KeyboardEvent(const AtomicString& eventType, const KeyboardEventInit& initializer)
@@ skipping 105 matching lines @@
         break;
     }
 }
 
 DEFINE_TRACE(KeyboardEvent)
 {
     UIEventWithKeyState::trace(visitor);
 }
 
 } // namespace blink