moved toggle and tri-state from user-modify to user-select to stay in sync with CSS3

no bug #
r=pierre

content/shared/src/nsCSSProps.cpp

@@ -597,16 +597,16 @@ const PRInt32 nsCSSProps::kUserModifyKTable[] = {
   eCSSKeyword_read_only,  NS_STYLE_USER_MODIFY_READ_ONLY,
   eCSSKeyword_read_write, NS_STYLE_USER_MODIFY_READ_WRITE,
   eCSSKeyword_write_only, NS_STYLE_USER_MODIFY_WRITE_ONLY,
-  eCSSKeyword_toggle,     NS_STYLE_USER_MODIFY_TOGGLE,
-  eCSSKeyword_tri_state,  NS_STYLE_USER_MODIFY_TRI_STATE,
   -1,-1
 };
 
 const PRInt32 nsCSSProps::kUserSelectKTable[] = {
-  eCSSKeyword_text,     NS_STYLE_USER_SELECT_TEXT,
-  eCSSKeyword_element,  NS_STYLE_USER_SELECT_ELEMENT,
-  eCSSKeyword_elements, NS_STYLE_USER_SELECT_ELEMENTS,
-  eCSSKeyword_all,      NS_STYLE_USER_SELECT_ALL,
+  eCSSKeyword_text,       NS_STYLE_USER_SELECT_TEXT,
+  eCSSKeyword_element,    NS_STYLE_USER_SELECT_ELEMENT,
+  eCSSKeyword_elements,   NS_STYLE_USER_SELECT_ELEMENTS,
+  eCSSKeyword_all,        NS_STYLE_USER_SELECT_ALL,
+  eCSSKeyword_toggle,     NS_STYLE_USER_SELECT_TOGGLE,
+  eCSSKeyword_tri_state,  NS_STYLE_USER_SELECT_TRI_STATE,
   -1,-1
 };
 

layout/base/nsStyleConsts.h

@@ -79,6 +79,8 @@
 #define NS_STYLE_USER_SELECT_ELEMENT    2
 #define NS_STYLE_USER_SELECT_ELEMENTS   3
 #define NS_STYLE_USER_SELECT_ALL        4
+#define NS_STYLE_USER_SELECT_TOGGLE     5
+#define NS_STYLE_USER_SELECT_TRI_STATE  6
 
 // user-input
 #define NS_STYLE_USER_INPUT_NONE      0
@@ -90,8 +92,6 @@
 #define NS_STYLE_USER_MODIFY_READ_ONLY   0
 #define NS_STYLE_USER_MODIFY_READ_WRITE  1
 #define NS_STYLE_USER_MODIFY_WRITE_ONLY  2
-#define NS_STYLE_USER_MODIFY_TOGGLE      3
-#define NS_STYLE_USER_MODIFY_TRI_STATE   4
 
 
 

layout/base/public/nsStyleConsts.h

@@ -79,6 +79,8 @@
 #define NS_STYLE_USER_SELECT_ELEMENT    2
 #define NS_STYLE_USER_SELECT_ELEMENTS   3
 #define NS_STYLE_USER_SELECT_ALL        4
+#define NS_STYLE_USER_SELECT_TOGGLE     5
+#define NS_STYLE_USER_SELECT_TRI_STATE  6
 
 // user-input
 #define NS_STYLE_USER_INPUT_NONE      0
@@ -90,8 +92,6 @@
 #define NS_STYLE_USER_MODIFY_READ_ONLY   0
 #define NS_STYLE_USER_MODIFY_READ_WRITE  1
 #define NS_STYLE_USER_MODIFY_WRITE_ONLY  2
-#define NS_STYLE_USER_MODIFY_TOGGLE      3
-#define NS_STYLE_USER_MODIFY_TRI_STATE   4
 
 
 

layout/html/style/src/nsCSSProps.cpp

@@ -597,16 +597,16 @@ const PRInt32 nsCSSProps::kUserModifyKTable[] = {
   eCSSKeyword_read_only,  NS_STYLE_USER_MODIFY_READ_ONLY,
   eCSSKeyword_read_write, NS_STYLE_USER_MODIFY_READ_WRITE,
   eCSSKeyword_write_only, NS_STYLE_USER_MODIFY_WRITE_ONLY,
-  eCSSKeyword_toggle,     NS_STYLE_USER_MODIFY_TOGGLE,
-  eCSSKeyword_tri_state,  NS_STYLE_USER_MODIFY_TRI_STATE,
   -1,-1
 };
 
 const PRInt32 nsCSSProps::kUserSelectKTable[] = {
-  eCSSKeyword_text,     NS_STYLE_USER_SELECT_TEXT,
-  eCSSKeyword_element,  NS_STYLE_USER_SELECT_ELEMENT,
-  eCSSKeyword_elements, NS_STYLE_USER_SELECT_ELEMENTS,
-  eCSSKeyword_all,      NS_STYLE_USER_SELECT_ALL,
+  eCSSKeyword_text,       NS_STYLE_USER_SELECT_TEXT,
+  eCSSKeyword_element,    NS_STYLE_USER_SELECT_ELEMENT,
+  eCSSKeyword_elements,   NS_STYLE_USER_SELECT_ELEMENTS,
+  eCSSKeyword_all,        NS_STYLE_USER_SELECT_ALL,
+  eCSSKeyword_toggle,     NS_STYLE_USER_SELECT_TOGGLE,
+  eCSSKeyword_tri_state,  NS_STYLE_USER_SELECT_TRI_STATE,
   -1,-1
 };
 

layout/style/nsCSSProps.cpp

@@ -597,16 +597,16 @@ const PRInt32 nsCSSProps::kUserModifyKTable[] = {
   eCSSKeyword_read_only,  NS_STYLE_USER_MODIFY_READ_ONLY,
   eCSSKeyword_read_write, NS_STYLE_USER_MODIFY_READ_WRITE,
   eCSSKeyword_write_only, NS_STYLE_USER_MODIFY_WRITE_ONLY,
-  eCSSKeyword_toggle,     NS_STYLE_USER_MODIFY_TOGGLE,
-  eCSSKeyword_tri_state,  NS_STYLE_USER_MODIFY_TRI_STATE,
   -1,-1
 };
 
 const PRInt32 nsCSSProps::kUserSelectKTable[] = {
-  eCSSKeyword_text,     NS_STYLE_USER_SELECT_TEXT,
-  eCSSKeyword_element,  NS_STYLE_USER_SELECT_ELEMENT,
-  eCSSKeyword_elements, NS_STYLE_USER_SELECT_ELEMENTS,
-  eCSSKeyword_all,      NS_STYLE_USER_SELECT_ALL,
+  eCSSKeyword_text,       NS_STYLE_USER_SELECT_TEXT,
+  eCSSKeyword_element,    NS_STYLE_USER_SELECT_ELEMENT,
+  eCSSKeyword_elements,   NS_STYLE_USER_SELECT_ELEMENTS,
+  eCSSKeyword_all,        NS_STYLE_USER_SELECT_ALL,
+  eCSSKeyword_toggle,     NS_STYLE_USER_SELECT_TOGGLE,
+  eCSSKeyword_tri_state,  NS_STYLE_USER_SELECT_TRI_STATE,
   -1,-1
 };