Bug 840367: Fix misnaming of keyword IDs in nsCSSKeywordList.h. r=heycam
authorL. David Baron <dbaron@dbaron.org>
Wed, 13 Feb 2013 11:53:56 -0800
changeset 121787 9b0d85344d320518068a2a5be975f0b22fda5043
parent 121786 28e6c11125831d36567263116121d0ae8768c2a1
child 121788 cb198943e783c94685592ef57a58f0bb800a23ef
push id24307
push useremorley@mozilla.com
push dateThu, 14 Feb 2013 10:47:46 +0000
treeherdermozilla-central@aceeea086ccb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersheycam
bugs840367
milestone21.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 840367: Fix misnaming of keyword IDs in nsCSSKeywordList.h. r=heycam
layout/style/nsCSSKeywordList.h
layout/style/nsCSSProps.cpp
--- a/layout/style/nsCSSKeywordList.h
+++ b/layout/style/nsCSSKeywordList.h
@@ -519,18 +519,18 @@ CSS_KEY(treeheadercell, treeheadercell)
 CSS_KEY(treeheadersortarrow, treeheadersortarrow)
 CSS_KEY(progressbar, progressbar)
 CSS_KEY(progressbar-vertical, progressbar_vertical)
 CSS_KEY(progresschunk, progresschunk)
 CSS_KEY(progresschunk-vertical, progresschunk_vertical)
 CSS_KEY(tab, tab)
 CSS_KEY(tabpanels, tabpanels)
 CSS_KEY(tabpanel, tabpanel)
-CSS_KEY(tab-scroll-arrow-back, tabscrollarrow_back)
-CSS_KEY(tab-scroll-arrow-forward, tabscrollarrow_forward)
+CSS_KEY(tab-scroll-arrow-back, tab_scroll_arrow_back)
+CSS_KEY(tab-scroll-arrow-forward, tab_scroll_arrow_forward)
 CSS_KEY(tooltip, tooltip)
 CSS_KEY(spinner, spinner)
 CSS_KEY(spinner-upbutton, spinner_upbutton)
 CSS_KEY(spinner-downbutton, spinner_downbutton)
 CSS_KEY(spinner-textfield, spinner_textfield)
 CSS_KEY(scrollbarbutton-up, scrollbarbutton_up)
 CSS_KEY(scrollbarbutton-down, scrollbarbutton_down)
 CSS_KEY(scrollbarbutton-left, scrollbarbutton_left)
@@ -551,34 +551,34 @@ CSS_KEY(checkmenuitem, checkmenuitem)
 CSS_KEY(radiomenuitem, radiomenuitem)
 CSS_KEY(menucheckbox, menucheckbox)
 CSS_KEY(menuradio, menuradio)
 CSS_KEY(menuseparator, menuseparator)
 CSS_KEY(menuarrow, menuarrow)
 CSS_KEY(menuimage, menuimage)
 CSS_KEY(menuitemtext, menuitemtext)
 CSS_KEY(menulist, menulist)
-CSS_KEY(menulist-button, menulistbutton)
-CSS_KEY(menulist-text, menulisttext)
-CSS_KEY(menulist-textfield, menulisttextfield)
+CSS_KEY(menulist-button, menulist_button)
+CSS_KEY(menulist-text, menulist_text)
+CSS_KEY(menulist-textfield, menulist_textfield)
 CSS_KEY(meterbar, meterbar)
 CSS_KEY(meterchunk, meterchunk)
 CSS_KEY(scale-horizontal, scale_horizontal)
 CSS_KEY(scale-vertical, scale_vertical)
 CSS_KEY(scalethumb-horizontal, scalethumb_horizontal)
 CSS_KEY(scalethumb-vertical, scalethumb_vertical)
 CSS_KEY(scalethumbstart, scalethumbstart)
 CSS_KEY(scalethumbend, scalethumbend)
 CSS_KEY(scalethumbtick, scalethumbtick)
 CSS_KEY(groupbox, groupbox)
-CSS_KEY(checkbox-container, checkboxcontainer)
-CSS_KEY(radio-container, radiocontainer)
-CSS_KEY(checkbox-label, checkboxlabel)
-CSS_KEY(radio-label, radiolabel)
-CSS_KEY(button-focus, buttonfocus)
+CSS_KEY(checkbox-container, checkbox_container)
+CSS_KEY(radio-container, radio_container)
+CSS_KEY(checkbox-label, checkbox_label)
+CSS_KEY(radio-label, radio_label)
+CSS_KEY(button-focus, button_focus)
 CSS_KEY(-moz-win-media-toolbox, _moz_win_media_toolbox)
 CSS_KEY(-moz-win-communications-toolbox, _moz_win_communications_toolbox)
 CSS_KEY(-moz-win-browsertabbar-toolbox, _moz_win_browsertabbar_toolbox)
 CSS_KEY(-moz-win-mediatext, _moz_win_mediatext)
 CSS_KEY(-moz-win-communicationstext, _moz_win_communicationstext)
 CSS_KEY(-moz-win-glass, _moz_win_glass)
 CSS_KEY(-moz-win-borderless-glass, _moz_win_borderless_glass)
 CSS_KEY(-moz-window-titlebar, _moz_window_titlebar)
--- a/layout/style/nsCSSProps.cpp
+++ b/layout/style/nsCSSProps.cpp
@@ -570,18 +570,18 @@ const int32_t nsCSSProps::kAppearanceKTa
   eCSSKeyword_treeheadersortarrow,    NS_THEME_TREEVIEW_HEADER_SORTARROW,
   eCSSKeyword_progressbar,            NS_THEME_PROGRESSBAR,
   eCSSKeyword_progresschunk,          NS_THEME_PROGRESSBAR_CHUNK,
   eCSSKeyword_progressbar_vertical,   NS_THEME_PROGRESSBAR_VERTICAL,
   eCSSKeyword_progresschunk_vertical, NS_THEME_PROGRESSBAR_CHUNK_VERTICAL,
   eCSSKeyword_tab,                    NS_THEME_TAB,
   eCSSKeyword_tabpanels,              NS_THEME_TAB_PANELS,
   eCSSKeyword_tabpanel,               NS_THEME_TAB_PANEL,
-  eCSSKeyword_tabscrollarrow_back,    NS_THEME_TAB_SCROLLARROW_BACK,
-  eCSSKeyword_tabscrollarrow_forward, NS_THEME_TAB_SCROLLARROW_FORWARD,
+  eCSSKeyword_tab_scroll_arrow_back,  NS_THEME_TAB_SCROLLARROW_BACK,
+  eCSSKeyword_tab_scroll_arrow_forward, NS_THEME_TAB_SCROLLARROW_FORWARD,
   eCSSKeyword_tooltip,                NS_THEME_TOOLTIP,
   eCSSKeyword_spinner,                NS_THEME_SPINNER,
   eCSSKeyword_spinner_upbutton,       NS_THEME_SPINNER_UP_BUTTON,
   eCSSKeyword_spinner_downbutton,     NS_THEME_SPINNER_DOWN_BUTTON,
   eCSSKeyword_spinner_textfield,      NS_THEME_SPINNER_TEXTFIELD,
   eCSSKeyword_scrollbar,              NS_THEME_SCROLLBAR,
   eCSSKeyword_scrollbar_small,        NS_THEME_SCROLLBAR_SMALL,
   eCSSKeyword_scrollbarbutton_up,     NS_THEME_SCROLLBAR_BUTTON_UP,
@@ -592,32 +592,32 @@ const int32_t nsCSSProps::kAppearanceKTa
   eCSSKeyword_scrollbartrack_vertical,      NS_THEME_SCROLLBAR_TRACK_VERTICAL,
   eCSSKeyword_scrollbarthumb_horizontal,    NS_THEME_SCROLLBAR_THUMB_HORIZONTAL,
   eCSSKeyword_scrollbarthumb_vertical,      NS_THEME_SCROLLBAR_THUMB_VERTICAL,
   eCSSKeyword_textfield,              NS_THEME_TEXTFIELD,
   eCSSKeyword_textfield_multiline,    NS_THEME_TEXTFIELD_MULTILINE,
   eCSSKeyword_caret,                  NS_THEME_TEXTFIELD_CARET,
   eCSSKeyword_searchfield,            NS_THEME_SEARCHFIELD,
   eCSSKeyword_menulist,               NS_THEME_DROPDOWN,
-  eCSSKeyword_menulistbutton,         NS_THEME_DROPDOWN_BUTTON,
-  eCSSKeyword_menulisttext,           NS_THEME_DROPDOWN_TEXT,
-  eCSSKeyword_menulisttextfield,      NS_THEME_DROPDOWN_TEXTFIELD,
+  eCSSKeyword_menulist_button,        NS_THEME_DROPDOWN_BUTTON,
+  eCSSKeyword_menulist_text,          NS_THEME_DROPDOWN_TEXT,
+  eCSSKeyword_menulist_textfield,     NS_THEME_DROPDOWN_TEXTFIELD,
   eCSSKeyword_scale_horizontal,       NS_THEME_SCALE_HORIZONTAL,
   eCSSKeyword_scale_vertical,         NS_THEME_SCALE_VERTICAL,
   eCSSKeyword_scalethumb_horizontal,  NS_THEME_SCALE_THUMB_HORIZONTAL,
   eCSSKeyword_scalethumb_vertical,    NS_THEME_SCALE_THUMB_VERTICAL,
   eCSSKeyword_scalethumbstart,        NS_THEME_SCALE_THUMB_START,
   eCSSKeyword_scalethumbend,          NS_THEME_SCALE_THUMB_END,
   eCSSKeyword_scalethumbtick,         NS_THEME_SCALE_TICK,
   eCSSKeyword_groupbox,               NS_THEME_GROUPBOX,
-  eCSSKeyword_checkboxcontainer,      NS_THEME_CHECKBOX_CONTAINER,
-  eCSSKeyword_radiocontainer,         NS_THEME_RADIO_CONTAINER,
-  eCSSKeyword_checkboxlabel,          NS_THEME_CHECKBOX_LABEL,
-  eCSSKeyword_radiolabel,             NS_THEME_RADIO_LABEL,
-  eCSSKeyword_buttonfocus,            NS_THEME_BUTTON_FOCUS,
+  eCSSKeyword_checkbox_container,     NS_THEME_CHECKBOX_CONTAINER,
+  eCSSKeyword_radio_container,        NS_THEME_RADIO_CONTAINER,
+  eCSSKeyword_checkbox_label,         NS_THEME_CHECKBOX_LABEL,
+  eCSSKeyword_radio_label,            NS_THEME_RADIO_LABEL,
+  eCSSKeyword_button_focus,           NS_THEME_BUTTON_FOCUS,
   eCSSKeyword_window,                 NS_THEME_WINDOW,
   eCSSKeyword_dialog,                 NS_THEME_DIALOG,
   eCSSKeyword_menubar,                NS_THEME_MENUBAR,
   eCSSKeyword_menupopup,              NS_THEME_MENUPOPUP,
   eCSSKeyword_menuitem,               NS_THEME_MENUITEM,
   eCSSKeyword_checkmenuitem,          NS_THEME_CHECKMENUITEM,
   eCSSKeyword_radiomenuitem,          NS_THEME_RADIOMENUITEM,
   eCSSKeyword_menucheckbox,           NS_THEME_MENUCHECKBOX,