corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1272599 part.2 Rename KeyboardEvent.key values, "MozHomeScreen" and "MozCameraFocusAdjust" to "GoHome" and "CameraFocus" except on B2G r=smaug

Browse Source 
KEYCODE_HOME was temporarily named as "MozHomeScreen" and KEYCODE_FOCUS was temprarily named as "MozCameraFocusAdjust" since they were not defined by the spec. However, in the latest spec, they are defined as "GoHome" and "CameraFocus". So, it is the time to rename them.

However, these temporary key names are still used by Gaia. Until it's fixed, we should keep using the temporary names only on B2G.

MozReview-Commit-ID: 9ILtZdf6EUQ
This commit is contained in:
Masayuki Nakano
2016-05-20 21:29:10 +09:00
parent d3bb88d26d
commit e40b267e96
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dom/events/KeyNameList.h
View File

@@ -29,11 +29,14 @@ DEFINE_KEYNAME_WITH_SAME_NAME(Unidentified)
* Our Internal Key Values (must have "Moz" prefix) * Our Internal Key Values (must have "Moz" prefix)
*****************************************************************************/ *****************************************************************************/
DEFINE_KEYNAME_INTERNAL(PrintableKey, "MozPrintableKey") DEFINE_KEYNAME_INTERNAL(PrintableKey, "MozPrintableKey")
DEFINE_KEYNAME_INTERNAL(HomeScreen, "MozHomeScreen")
DEFINE_KEYNAME_INTERNAL(CameraFocusAdjust, "MozCameraFocusAdjust")
DEFINE_KEYNAME_INTERNAL(SoftLeft, "MozSoftLeft") DEFINE_KEYNAME_INTERNAL(SoftLeft, "MozSoftLeft")
DEFINE_KEYNAME_INTERNAL(SoftRight, "MozSoftRight") DEFINE_KEYNAME_INTERNAL(SoftRight, "MozSoftRight")
#ifdef MOZ_B2G
DEFINE_KEYNAME_INTERNAL(HomeScreen, "MozHomeScreen")
DEFINE_KEYNAME_INTERNAL(CameraFocusAdjust, "MozCameraFocusAdjust")
#endif // #ifdef MOZ_B2G
/****************************************************************************** /******************************************************************************
* Modifier Keys * Modifier Keys
*****************************************************************************/ *****************************************************************************/

12
widget/NativeKeyToDOMKeyName.h
View File

@@ -1232,12 +1232,14 @@ KEY_MAP_ANDROID (Call, AKEYCODE_CALL)
KEY_MAP_QT (Camera, Qt::Key_Camera) KEY_MAP_QT (Camera, Qt::Key_Camera)
KEY_MAP_ANDROID (Camera, AKEYCODE_CAMERA) KEY_MAP_ANDROID (Camera, AKEYCODE_CAMERA)
// CameraFocusAdjust (should be renamed to CameraFocus) // CameraFocus
KEY_MAP_QT (CameraFocusAdjust, Qt::Key_CameraFocus) KEY_MAP_QT (CameraFocus, Qt::Key_CameraFocus)
KEY_MAP_ANDROID (CameraFocusAdjust, AKEYCODE_FOCUS) KEY_MAP_ANDROID_EXCEPT_B2G(CameraFocus, AKEYCODE_FOCUS)
KEY_MAP_B2G (CameraFocusAdjust, AKEYCODE_FOCUS)
// HomeScreen (should be renamed to GoHome) // GoHome
KEY_MAP_ANDROID (HomeScreen, AKEYCODE_HOME) KEY_MAP_ANDROID_EXCEPT_B2G(GoHome, AKEYCODE_HOME)
KEY_MAP_B2G (HomeScreen, AKEYCODE_HOME)
/****************************************************************************** /******************************************************************************
* TV Keys * TV Keys