Bug 1023062 Support "TV", "TVInput", "TVPower", "AVInput", "AVPower", "STBInput" and "STBPower" key values on Androind and Gonk r=nchen+mwu+smaug

dom/events/KeyNameList.h

@@ -279,8 +279,8 @@ DEFINE_KEYNAME_WITH_SAME_NAME(AudioBassBoostUp)
 // DEFINE_KEYNAME_WITH_SAME_NAME(AudioFaderFront)
 // DEFINE_KEYNAME_WITH_SAME_NAME(AudioFaderRear)
 // DEFINE_KEYNAME_WITH_SAME_NAME(AudioSurroundModeNext)
-// DEFINE_KEYNAME_WITH_SAME_NAME(AVRInput)
-// DEFINE_KEYNAME_WITH_SAME_NAME(AVRPower)
+DEFINE_KEYNAME_WITH_SAME_NAME(AVRInput)
+DEFINE_KEYNAME_WITH_SAME_NAME(AVRPower)
 DEFINE_KEYNAME_WITH_SAME_NAME(ChannelDown)
 DEFINE_KEYNAME_WITH_SAME_NAME(ChannelUp)
 DEFINE_KEYNAME_WITH_SAME_NAME(ColorF0Red)
@@ -340,13 +340,13 @@ DEFINE_KEYNAME_WITH_SAME_NAME(RandomToggle)
 // DEFINE_KEYNAME_WITH_SAME_NAME(ScreenModeNext)
 DEFINE_KEYNAME_WITH_SAME_NAME(Settings)
 // DEFINE_KEYNAME_WITH_SAME_NAME(SplitScreenToggle)
-// DEFINE_KEYNAME_WITH_SAME_NAME(STBInput)
-// DEFINE_KEYNAME_WITH_SAME_NAME(STBPower)
+DEFINE_KEYNAME_WITH_SAME_NAME(STBInput)
+DEFINE_KEYNAME_WITH_SAME_NAME(STBPower)
 DEFINE_KEYNAME_WITH_SAME_NAME(Subtitle)
 // DEFINE_KEYNAME_WITH_SAME_NAME(Teletext)
-// DEFINE_KEYNAME_WITH_SAME_NAME(TV)
-// DEFINE_KEYNAME_WITH_SAME_NAME(TVInput)
-// DEFINE_KEYNAME_WITH_SAME_NAME(TVPower)
+DEFINE_KEYNAME_WITH_SAME_NAME(TV)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVInput)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVPower)
 // DEFINE_KEYNAME_WITH_SAME_NAME(VideoModeNext)
 // DEFINE_KEYNAME_WITH_SAME_NAME(Wink)
 DEFINE_KEYNAME_WITH_SAME_NAME(ZoomToggle)

widget/NativeKeyToDOMKeyName.h

@@ -1042,6 +1042,12 @@ KEY_MAP_QT      (AudioBassBoostDown, Qt::Key_BassDown)
 // AudioBassBoostUp
 KEY_MAP_QT      (AudioBassBoostUp, Qt::Key_BassUp)
 
+// AVRInput
+KEY_MAP_ANDROID (AVRInput, AKEYCODE_AVR_INPUT)
+
+// AVRPower
+KEY_MAP_ANDROID (AVRPower, AKEYCODE_AVR_POWER)
+
 // ChannelDown
 KEY_MAP_ANDROID (ChannelDown, AKEYCODE_CHANNEL_DOWN)
 
@@ -1118,11 +1124,26 @@ KEY_MAP_QT      (RandomToggle, Qt::Key_AudioRandomPlay)
 // Settings
 KEY_MAP_ANDROID (Settings, AKEYCODE_SETTINGS)
 
+// STBInput
+KEY_MAP_ANDROID (STBInput, AKEYCODE_STB_INPUT)
+
+// STBPower
+KEY_MAP_ANDROID (STBPower, AKEYCODE_STB_POWER)
+
 // Subtitle
 KEY_MAP_GTK     (Subtitle, GDK_Subtitle)
 KEY_MAP_QT      (Subtitle, Qt::Key_Subtitle)
 KEY_MAP_ANDROID (Subtitle, AKEYCODE_CAPTIONS)
 
+// TV
+KEY_MAP_ANDROID (TV, AKEYCODE_TV)
+
+// TVInput
+KEY_MAP_ANDROID (TVInput, AKEYCODE_TV_INPUT)
+
+// TVPower
+KEY_MAP_ANDROID (TVPower, AKEYCODE_TV_POWER)
+
 // ZoomToggle
 KEY_MAP_WIN     (ZoomToggle, VK_ZOOM)
 KEY_MAP_QT      (ZoomToggle, Qt::Key_Zoom)

widget/android/nsWindow.cpp

@@ -1402,12 +1402,6 @@ ConvertAndroidKeyCodeToKeyNameIndex(AndroidGeckoEvent& aAndroidGeckoEvent)
         case AKEYCODE_MEDIA_CLOSE:
 
         case AKEYCODE_DVR:
-        case AKEYCODE_TV_POWER:
-        case AKEYCODE_TV_INPUT:
-        case AKEYCODE_STB_POWER:
-        case AKEYCODE_STB_INPUT:
-        case AKEYCODE_AVR_POWER:
-        case AKEYCODE_AVR_INPUT:
 
         case AKEYCODE_BUTTON_1:
         case AKEYCODE_BUTTON_2: