Bug 912866 Rename key values of color buttons to the latest D3E draft's names (like 'ColorF0Red') r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Tue, 30 Dec 2014 10:47:54 +0900
changeset 247435 fbfc02e1c647a2c1c73c6de81614700cdc508d93
parent 247434 607e30d0189fbda4ad403e6917fff6c7b72d4ab2
child 247436 20b4fe3c7dcc573f4e0f8914c94ebbe3209d19ea
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs912866
milestone37.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 912866 Rename key values of color buttons to the latest D3E draft's names (like 'ColorF0Red') r=smaug
dom/events/KeyNameList.h
widget/NativeKeyToDOMKeyName.h
--- a/dom/events/KeyNameList.h
+++ b/dom/events/KeyNameList.h
@@ -278,22 +278,22 @@ DEFINE_KEYNAME_WITH_SAME_NAME(AudioBassB
 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(ChannelDown)
 DEFINE_KEYNAME_WITH_SAME_NAME(ChannelUp)
-DEFINE_KEYNAME_WITH_SAME_NAME(Red) // Rename to ColorF0Red
-DEFINE_KEYNAME_WITH_SAME_NAME(Green) // Rename to ColorF1Green
-DEFINE_KEYNAME_WITH_SAME_NAME(Yellow) // Rename to ColorF2Yellow
-DEFINE_KEYNAME_WITH_SAME_NAME(Blue) // Rename to ColorF3Blue
-// DEFINE_KEYNAME_WITH_SAME_NAME(Grey) // Rename to ColorF4Grey
-// DEFINE_KEYNAME_WITH_SAME_NAME(Brown) // Rename to ColorF5Brown
+DEFINE_KEYNAME_WITH_SAME_NAME(ColorF0Red)
+DEFINE_KEYNAME_WITH_SAME_NAME(ColorF1Green)
+DEFINE_KEYNAME_WITH_SAME_NAME(ColorF2Yellow)
+DEFINE_KEYNAME_WITH_SAME_NAME(ColorF3Blue)
+// DEFINE_KEYNAME_WITH_SAME_NAME(ColorF4Grey)
+// DEFINE_KEYNAME_WITH_SAME_NAME(ColorF5Brown)
 // DEFINE_KEYNAME_WITH_SAME_NAME(ClosedCaptionToggle)
 DEFINE_KEYNAME_WITH_SAME_NAME(Dimmer)
 // DEFINE_KEYNAME_WITH_SAME_NAME(DisplaySwap)
 DEFINE_KEYNAME_WITH_SAME_NAME(Exit)
 // DEFINE_KEYNAME_WITH_SAME_NAME(ClearFavorite0) // Rename to FavoriteClear0
 // DEFINE_KEYNAME_WITH_SAME_NAME(ClearFavorite1) // Rename to FavoriteClear1
 // DEFINE_KEYNAME_WITH_SAME_NAME(ClearFavorite2) // Rename to FavoriteClear2
 // DEFINE_KEYNAME_WITH_SAME_NAME(ClearFavorite3) // Rename to FavoriteClear3
--- a/widget/NativeKeyToDOMKeyName.h
+++ b/widget/NativeKeyToDOMKeyName.h
@@ -911,31 +911,35 @@ KEY_MAP_QT      (AudioBassBoostDown, Qt:
 KEY_MAP_QT      (AudioBassBoostUp, Qt::Key_BassUp)
 
 // ChannelDown
 KEY_MAP_ANDROID (ChannelDown, AKEYCODE_CHANNEL_DOWN)
 
 // ChannelUp
 KEY_MAP_ANDROID (ChannelUp, AKEYCODE_CHANNEL_UP)
 
-// Red
-KEY_MAP_GTK     (Red, GDK_Red)
-KEY_MAP_ANDROID (Red, AKEYCODE_PROG_RED)
+// ColorF0Red
+KEY_MAP_GTK     (ColorF0Red, GDK_Red)
+KEY_MAP_QT      (ColorF0Red, Qt::Key_Red)
+KEY_MAP_ANDROID (ColorF0Red, AKEYCODE_PROG_RED)
 
-// Green
-KEY_MAP_GTK     (Green, GDK_Green)
-KEY_MAP_ANDROID (Green, AKEYCODE_PROG_GREEN)
+// ColorF1Green
+KEY_MAP_GTK     (ColorF1Green, GDK_Green)
+KEY_MAP_QT      (ColorF1Green, Qt::Key_Green)
+KEY_MAP_ANDROID (ColorF1Green, AKEYCODE_PROG_GREEN)
 
-// Yellow
-KEY_MAP_GTK     (Yellow, GDK_Yellow)
-KEY_MAP_ANDROID (Yellow, AKEYCODE_PROG_YELLOW)
+// ColorF2Yellow
+KEY_MAP_GTK     (ColorF2Yellow, GDK_Yellow)
+KEY_MAP_QT      (ColorF2Yellow, Qt::Key_Yellow)
+KEY_MAP_ANDROID (ColorF2Yellow, AKEYCODE_PROG_YELLOW)
 
-// Blue
-KEY_MAP_GTK     (Blue, GDK_Blue)
-KEY_MAP_ANDROID (Blue, AKEYCODE_PROG_BLUE)
+// ColorF3Blue
+KEY_MAP_GTK     (ColorF3Blue, GDK_Blue)
+KEY_MAP_QT      (ColorF3Blue, Qt::Key_Blue)
+KEY_MAP_ANDROID (ColorF3Blue, AKEYCODE_PROG_BLUE)
 
 // Dimmer
 KEY_MAP_GTK     (Dimmer, GDK_BrightnessAdjust)
 KEY_MAP_QT      (Dimmer, Qt::Key_BrightnessAdjust)
 
 // Exit
 KEY_MAP_ANDROID (Exit, AKEYCODE_HOME)