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

Bug 1436508 part 9. Remove nsIDOMKeyEvent::DOM_KEY* constants. r=masayuki

Browse Source 
MozReview-Commit-ID: JXCCrbaMcn
This commit is contained in:
Boris Zbarsky 2018-02-09 11:17:09 -05:00
parent 29c1a6e2e2
commit 53daea632f
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/events/KeyboardEvent.cpp
View File

@ -369,7 +369,7 @@ KeyboardEvent::ShouldResistFingerprinting(CallerType aCallerType)
mEvent->mFlags.mInSystemGroup ||
!nsContentUtils::ShouldResistFingerprinting() ||
mEvent->AsKeyboardEvent()->mLocation ==
nsIDOMKeyEvent::DOM_KEY_LOCATION_NUMPAD) {
KeyboardEventBinding::DOM_KEY_LOCATION_NUMPAD) {
return false;
}

5
dom/interfaces/events/nsIDOMKeyEvent.idl
View File

@ -224,9 +224,4 @@ interface nsIDOMKeyEvent : nsIDOMUIEvent
// OEM specific virtual keyCode of Windows should pass through DOM keyCode
// for compatibility with the other web browsers on Windows.
const unsigned long DOM_VK_WIN_OEM_CLEAR = 0xFE;
const unsigned long DOM_KEY_LOCATION_STANDARD = 0x00;
const unsigned long DOM_KEY_LOCATION_LEFT = 0x01;
const unsigned long DOM_KEY_LOCATION_RIGHT = 0x02;
const unsigned long DOM_KEY_LOCATION_NUMPAD = 0x03;
};

4
toolkit/components/resistfingerprinting/nsRFPService.cpp
View File

@ -14,6 +14,7 @@
#include "mozilla/Services.h"
#include "mozilla/StaticPtr.h"
#include "mozilla/TextEvents.h"
#include "mozilla/dom/KeyboardEventBinding.h"
#include "nsCOMPtr.h"
#include "nsCoord.h"
@ -620,7 +621,8 @@ nsRFPService::GetSpoofedCode(const nsIDocument* aDoc,
// We need to change the 'Left' with 'Right' if the location indicates
// it's a right key.
if (aKeyboardEvent->mLocation == nsIDOMKeyEvent::DOM_KEY_LOCATION_RIGHT &&
if (aKeyboardEvent->mLocation ==
dom::KeyboardEventBinding::DOM_KEY_LOCATION_RIGHT &&
StringEndsWith(aOut, NS_LITERAL_STRING("Left"))) {
aOut.ReplaceLiteral(aOut.Length() - 4, 4, u"Right");
}

10
widget/TextEvents.h
View File

@ -15,8 +15,8 @@
#include "mozilla/FontRange.h"
#include "mozilla/TextRange.h"
#include "mozilla/WritingModes.h"
#include "mozilla/dom/KeyboardEventBinding.h"
#include "nsCOMPtr.h"
#include "nsIDOMKeyEvent.h"
#include "nsISelectionController.h"
#include "nsISelectionListener.h"
#include "nsITransferable.h"
@ -43,10 +43,10 @@ namespace mozilla {
enum : uint32_t
{
eKeyLocationStandard = nsIDOMKeyEvent::DOM_KEY_LOCATION_STANDARD,
eKeyLocationLeft = nsIDOMKeyEvent::DOM_KEY_LOCATION_LEFT,
eKeyLocationRight = nsIDOMKeyEvent::DOM_KEY_LOCATION_RIGHT,
eKeyLocationNumpad = nsIDOMKeyEvent::DOM_KEY_LOCATION_NUMPAD
eKeyLocationStandard = dom::KeyboardEventBinding::DOM_KEY_LOCATION_STANDARD,
eKeyLocationLeft = dom::KeyboardEventBinding::DOM_KEY_LOCATION_LEFT,
eKeyLocationRight = dom::KeyboardEventBinding::DOM_KEY_LOCATION_RIGHT,
eKeyLocationNumpad = dom::KeyboardEventBinding::DOM_KEY_LOCATION_NUMPAD
};
const nsCString GetDOMKeyCodeName(uint32_t aKeyCode);