Allow the initial value of -moz-user-select to be specified with 'auto'. b=432888 r+sr=bzbarsky

layout/style/nsCSSParser.cpp

@@ -5100,7 +5100,7 @@ PRBool CSSParserImpl::ParseSingleValueProperty(nsresult& aErrorCode,
     return ParseVariant(aErrorCode, aValue, VARIANT_HK,
                         nsCSSProps::kUserModifyKTable);
   case eCSSProperty_user_select:
-    return ParseVariant(aErrorCode, aValue, VARIANT_HOK,
+    return ParseVariant(aErrorCode, aValue, VARIANT_AHK | VARIANT_NONE,
                         nsCSSProps::kUserSelectKTable);
   case eCSSProperty_vertical_align:
     return ParseVariant(aErrorCode, aValue, VARIANT_HKLP,

layout/style/nsRuleNode.cpp

@@ -2919,8 +2919,8 @@ nsRuleNode::ComputeUIResetData(void* aStartStruct,
     inherited = PR_TRUE;
     ui->mUserSelect = parentUI->mUserSelect;
   }
-  else if (eCSSUnit_Initial == uiData.mUserSelect.GetUnit()) {
-    // FIXME There's no other way to specify this value!
+  else if (eCSSUnit_Initial == uiData.mUserSelect.GetUnit() ||
+           eCSSUnit_Auto == uiData.mUserSelect.GetUnit()) {
     ui->mUserSelect = NS_STYLE_USER_SELECT_AUTO;
   }
 

layout/style/test/test_compute_data_with_start_struct.html

@@ -20,14 +20,8 @@
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
-var gXFailComputed = {
-  // The initial value of -moz-user-select can't be specified and isn't
-  // serialized correctly.
-  "-moz-user-select": true
-};
-
 function xfail_computecheck(prop, roundnum) {
-    return prop in gXFailComputed;
+    return false;
 }
 
 function xfail_test(prop, roundnum) {

layout/style/test/test_value_computation.html

@@ -37,7 +37,6 @@
 
 var gNotAccepted = {
   "-moz-column-width": [ "50%" ],
-  "-moz-user-select": [ "auto" ],
   "list-style": [ "none disc outside" ],
 };
 

layout/style/test/test_value_storage.html

@@ -59,7 +59,6 @@ var gShorthandsWithoutCondensingSerialize = {
 
 var gNotAccepted = {
   "-moz-column-width": [ "50%" ],
-  "-moz-user-select": [ "auto" ],
   "list-style": [ "none disc outside" ],
 };