| Index: third_party/WebKit/Source/platform/PlatformEvent.h
|
| diff --git a/third_party/WebKit/Source/platform/PlatformEvent.h b/third_party/WebKit/Source/platform/PlatformEvent.h
|
| index 065e959b6b957dd8256022c128566f0123788990..62b6cd29025e7d954a301869e6253e41b14578ae 100644
|
| --- a/third_party/WebKit/Source/platform/PlatformEvent.h
|
| +++ b/third_party/WebKit/Source/platform/PlatformEvent.h
|
| @@ -34,7 +34,7 @@ namespace blink {
|
| class PlatformEvent {
|
| DISALLOW_NEW();
|
| public:
|
| - enum Type {
|
| + enum EventType {
|
| NoType = 0,
|
|
|
| // PlatformKeyboardEvent
|
| @@ -121,14 +121,14 @@ public:
|
| RailsModeVertical = 2,
|
| };
|
|
|
| - Type type() const { return static_cast<Type>(m_type); }
|
| + EventType type() const { return static_cast<EventType>(m_type); }
|
|
|
| bool shiftKey() const { return m_modifiers & ShiftKey; }
|
| bool ctrlKey() const { return m_modifiers & CtrlKey; }
|
| bool altKey() const { return m_modifiers & AltKey; }
|
| bool metaKey() const { return m_modifiers & MetaKey; }
|
|
|
| - Modifiers modifiers() const { return static_cast<Modifiers>(m_modifiers); }
|
| + Modifiers getModifiers() const { return static_cast<Modifiers>(m_modifiers); }
|
|
|
| double timestamp() const { return m_timestamp; }
|
|
|
| @@ -140,14 +140,14 @@ protected:
|
| {
|
| }
|
|
|
| - explicit PlatformEvent(Type type)
|
| + explicit PlatformEvent(EventType type)
|
| : m_type(type)
|
| , m_modifiers(0)
|
| , m_timestamp(0)
|
| {
|
| }
|
|
|
| - PlatformEvent(Type type, Modifiers modifiers, double timestamp)
|
| + PlatformEvent(EventType type, Modifiers modifiers, double timestamp)
|
| : m_type(type)
|
| , m_modifiers(modifiers)
|
| , m_timestamp(timestamp)
|
|
|