| Index: Source/core/dom/KeyboardEvent.cpp
|
| diff --git a/Source/core/dom/KeyboardEvent.cpp b/Source/core/dom/KeyboardEvent.cpp
|
| index 5354fc0b67c6bfbeb189f44ac80b953c27678f90..ae063354ee76faec6c468b81ab14c2c83cf7bb2a 100644
|
| --- a/Source/core/dom/KeyboardEvent.cpp
|
| +++ b/Source/core/dom/KeyboardEvent.cpp
|
| @@ -87,7 +87,7 @@ static inline KeyboardEvent::KeyLocationCode keyLocationCode(const PlatformKeybo
|
| }
|
|
|
| KeyboardEventInit::KeyboardEventInit()
|
| - : keyLocation(0)
|
| + : location(0)
|
| , ctrlKey(false)
|
| , altKey(false)
|
| , shiftKey(false)
|
| @@ -96,7 +96,7 @@ KeyboardEventInit::KeyboardEventInit()
|
| }
|
|
|
| KeyboardEvent::KeyboardEvent()
|
| - : m_keyLocation(DOMKeyLocationStandard)
|
| + : m_location(DOMKeyLocationStandard)
|
| , m_altGraphKey(false)
|
| {
|
| ScriptWrappable::init(this);
|
| @@ -107,7 +107,7 @@ KeyboardEvent::KeyboardEvent(const PlatformKeyboardEvent& key, AbstractView* vie
|
| true, true, view, 0, key.ctrlKey(), key.altKey(), key.shiftKey(), key.metaKey())
|
| , m_keyEvent(adoptPtr(new PlatformKeyboardEvent(key)))
|
| , m_keyIdentifier(key.keyIdentifier())
|
| - , m_keyLocation(keyLocationCode(key))
|
| + , m_location(keyLocationCode(key))
|
| , m_altGraphKey(false)
|
| {
|
| ScriptWrappable::init(this);
|
| @@ -116,18 +116,18 @@ KeyboardEvent::KeyboardEvent(const PlatformKeyboardEvent& key, AbstractView* vie
|
| KeyboardEvent::KeyboardEvent(const AtomicString& eventType, const KeyboardEventInit& initializer)
|
| : UIEventWithKeyState(eventType, initializer.bubbles, initializer.cancelable, initializer.view, initializer.detail, initializer.ctrlKey, initializer.altKey, initializer.shiftKey, initializer.metaKey)
|
| , m_keyIdentifier(initializer.keyIdentifier)
|
| - , m_keyLocation(initializer.keyLocation)
|
| + , m_location(initializer.location)
|
| , m_altGraphKey(false)
|
| {
|
| ScriptWrappable::init(this);
|
| }
|
|
|
| KeyboardEvent::KeyboardEvent(const AtomicString& eventType, bool canBubble, bool cancelable, AbstractView *view,
|
| - const String &keyIdentifier, unsigned keyLocation,
|
| + const String &keyIdentifier, unsigned location,
|
| bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool altGraphKey)
|
| : UIEventWithKeyState(eventType, canBubble, cancelable, view, 0, ctrlKey, altKey, shiftKey, metaKey)
|
| , m_keyIdentifier(keyIdentifier)
|
| - , m_keyLocation(keyLocation)
|
| + , m_location(location)
|
| , m_altGraphKey(altGraphKey)
|
| {
|
| ScriptWrappable::init(this);
|
| @@ -138,7 +138,7 @@ KeyboardEvent::~KeyboardEvent()
|
| }
|
|
|
| void KeyboardEvent::initKeyboardEvent(const AtomicString& type, bool canBubble, bool cancelable, AbstractView* view,
|
| - const String &keyIdentifier, unsigned keyLocation,
|
| + const String &keyIdentifier, unsigned location,
|
| bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool altGraphKey)
|
| {
|
| if (dispatched())
|
| @@ -147,7 +147,7 @@ void KeyboardEvent::initKeyboardEvent(const AtomicString& type, bool canBubble,
|
| initUIEvent(type, canBubble, cancelable, view, 0);
|
|
|
| m_keyIdentifier = keyIdentifier;
|
| - m_keyLocation = keyLocation;
|
| + m_location = location;
|
| m_ctrlKey = ctrlKey;
|
| m_shiftKey = shiftKey;
|
| m_altKey = altKey;
|
|
|