Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 08:12:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out nsXBLPrototypeHandler changes from changeset d09b4e60bb09 to fix bug 776075.

Browse Source
This commit is contained in:
L. David Baron 2012-08-20 19:23:32 -07:00
parent eb164315fe
commit e780b1cb86
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
content/xbl/src/nsXBLPrototypeHandler.cpp
View File

@ -785,18 +785,21 @@ nsXBLPrototypeHandler::ConstructPrototype(nsIContent* aKeyElement,
if (!key.IsEmpty()) { if (!key.IsEmpty()) {
if (mKeyMask == 0) if (mKeyMask == 0)
mKeyMask = cAllModifiers; mKeyMask = cAllModifiers;
nsContentUtils::ASCIIToLower(key); ToLowerCase(key);
// We have a charcode. // We have a charcode.
mMisc = 1; mMisc = 1;
mDetail = key[0]; mDetail = key[0];
const PRUint8 GTK2Modifiers = cShift | cControl | cShiftMask | cControlMask; const PRUint8 GTK2Modifiers = cShift | cControl | cShiftMask | cControlMask;
if ((mKeyMask & GTK2Modifiers) == GTK2Modifiers && if ((mKeyMask & GTK2Modifiers) == GTK2Modifiers &&
modifiers.First() != PRUnichar(',') && mDetail == 'u') modifiers.First() != PRUnichar(',') &&
(mDetail == 'u' || mDetail == 'U'))
ReportKeyConflict(key.get(), modifiers.get(), aKeyElement, "GTK2Conflict"); ReportKeyConflict(key.get(), modifiers.get(), aKeyElement, "GTK2Conflict");
const PRUint8 WinModifiers = cControl | cAlt | cControlMask | cAltMask; const PRUint8 WinModifiers = cControl | cAlt | cControlMask | cAltMask;
if ((mKeyMask & WinModifiers) == WinModifiers && if ((mKeyMask & WinModifiers) == WinModifiers &&
modifiers.First() != PRUnichar(',') && ('a' <= mDetail && mDetail <= 'z')) modifiers.First() != PRUnichar(',') &&
(('A' <= mDetail && mDetail <= 'Z') ||
('a' <= mDetail && mDetail <= 'z')))
ReportKeyConflict(key.get(), modifiers.get(), aKeyElement, "WinConflict"); ReportKeyConflict(key.get(), modifiers.get(), aKeyElement, "WinConflict");
} }
else { else {