Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 21:00:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 769190 part.1 Rename Scroll and Win to ScrollLock and OS for the argument of getModifierState() r=smaug, sr=jst

Browse Source
This commit is contained in:
Masayuki Nakano 2012-07-06 09:42:05 +09:00
parent 6286f2e60f
commit 230e9a8242
6 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
content/events/test/test_dom_keyboard_event.html
View File

@ -72,12 +72,13 @@ function testInitializingUntrustedEvent()
];
const kOtherModifierName = [
"CapsLock", "NumLock", "Scroll", "SymbolLock", "Fn", "Win", "AltGraph"
"CapsLock", "NumLock", "ScrollLock", "SymbolLock", "Fn", "OS", "AltGraph"
];
const kInvalidModifierName = [
"shift", "control", "alt", "meta", "capslock", "numlock", "scroll",
"symbollock", "fn", "win", "altgraph", "Invalid", "Shift Control"
"shift", "control", "alt", "meta", "capslock", "numlock", "scrolllock",
"symbollock", "fn", "os", "altgraph", "Invalid", "Shift Control",
"Win", "Scroll"
];
for (var i = 0; i < kTests.length; i++) {

7
content/events/test/test_dom_mouse_event.html
View File

@ -81,12 +81,13 @@ function testInitializingUntrustedEvent()
];
const kOtherModifierName = [
"CapsLock", "NumLock", "Scroll", "SymbolLock", "Fn", "Win", "AltGraph"
"CapsLock", "NumLock", "ScrollLock", "SymbolLock", "Fn", "OS", "AltGraph"
];
const kInvalidModifierName = [
"shift", "control", "alt", "meta", "capslock", "numlock", "scroll",
"symbollock", "fn", "win", "altgraph", "Invalid", "Shift Control"
"shift", "control", "alt", "meta", "capslock", "numlock", "scrolllock",
"symbollock", "fn", "os", "altgraph", "Invalid", "Shift Control",
"Win", "Scroll"
];
for (var i = 0; i < kTests.length; i++) {

4
dom/base/nsDOMWindowUtils.cpp
View File

@ -459,13 +459,13 @@ nsDOMWindowUtils::GetWidgetModifiers(PRInt32 aModifiers)
if (aModifiers & nsIDOMWindowUtils::MODIFIER_NUMLOCK) {
result |= widget::MODIFIER_NUMLOCK;
}
if (aModifiers & nsIDOMWindowUtils::MODIFIER_SCROLL) {
if (aModifiers & nsIDOMWindowUtils::MODIFIER_SCROLLLOCK) {
result |= widget::MODIFIER_SCROLL;
}
if (aModifiers & nsIDOMWindowUtils::MODIFIER_SYMBOLLOCK) {
result |= widget::MODIFIER_SYMBOLLOCK;
}
if (aModifiers & nsIDOMWindowUtils::MODIFIER_WIN) {
if (aModifiers & nsIDOMWindowUtils::MODIFIER_OS) {
result |= widget::MODIFIER_WIN;
}
return result;

4
dom/interfaces/base/nsIDOMWindowUtils.idl
View File

@ -182,9 +182,9 @@ interface nsIDOMWindowUtils : nsISupports {
const long MODIFIER_CAPSLOCK = 0x0020;
const long MODIFIER_FN = 0x0040;
const long MODIFIER_NUMLOCK = 0x0080;
const long MODIFIER_SCROLL = 0x0100;
const long MODIFIER_SCROLLLOCK = 0x0100;
const long MODIFIER_SYMBOLLOCK = 0x0200;
const long MODIFIER_WIN = 0x0400;
const long MODIFIER_OS = 0x0400;
/** Synthesize a mouse event. The event types supported are:
* mousedown, mouseup, mousemove, mouseover, mouseout, contextmenu

6
testing/mochitest/tests/SimpleTest/EventUtils.js
View File

@ -147,13 +147,13 @@ function _parseModifiers(aEvent)
mval |= nsIDOMWindowUtils.MODIFIER_NUMLOCK;
}
if (aEvent.scrollLockKey) {
mval |= nsIDOMWindowUtils.MODIFIER_SCROLL;
mval |= nsIDOMWindowUtils.MODIFIER_SCROLLLOCK;
}
if (aEvent.symbolLockKey) {
mval |= nsIDOMWindowUtils.MODIFIER_SYMBOLLOCK;
}
if (aEvent.winKey) {
mval |= nsIDOMWindowUtils.MODIFIER_WIN;
if (aEvent.osKey) {
mval |= nsIDOMWindowUtils.MODIFIER_OS;
}
return mval;

4
widget/nsEvent.h
View File

@ -113,9 +113,9 @@ typedef PRUint16 Modifiers;
#define NS_DOM_KEYNAME_FN "Fn"
#define NS_DOM_KEYNAME_META "Meta"
#define NS_DOM_KEYNAME_NUMLOCK "NumLock"
#define NS_DOM_KEYNAME_SCROLL "Scroll"
#define NS_DOM_KEYNAME_SCROLL "ScrollLock"
#define NS_DOM_KEYNAME_SHIFT "Shift"
#define NS_DOM_KEYNAME_SYMBOLLOCK "SymbolLock"
#define NS_DOM_KEYNAME_WIN "Win"
#define NS_DOM_KEYNAME_WIN "OS"
#endif // nsEvent_h__