Backed out changeset e528713f882c (bug 1365614)

2017-05-22 15:45:34 +02:00 · 2017-05-22 15:45:34 +02:00 · 2565b104f7
--- a/layout/reftests/native-theme/progress-overflow-small.html
+++ b/layout/reftests/native-theme/progress-overflow-small.html
@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
  <body>
-    <div style="-moz-appearance: progressbar; width:180px; height:6px;">
-      <div style="-moz-appearance: progresschunk; width:50%; height:100%;">
+    <div style="-moz-appearance: progressbar; appearance: auto; width:180px; height:6px;">
+      <div style="-moz-appearance: progresschunk; appearance: auto; width:50%; height:100%;">
      </div>
    </div>
  </body>
--- a/layout/reftests/native-theme/reftest.list
+++ b/layout/reftests/native-theme/reftest.list
@ -78,7 +78,7 @@ skip-if(!winWidget) == scroll-thumb-minimum-size-notheme.html scroll-thumb-minim
 # animated progress bars.
 # Nothing shows up on Android, presumably because that appearance type is
 # not implemented.
-pref(layout.css.moz-appearance.enabled,true) skip-if(cocoaWidget) skip-if(winWidget) == progress-overflow.html progress-overflow-ref.html
-pref(layout.css.moz-appearance.enabled,true) fails-if(Android) skip-if(cocoaWidget) skip-if(winWidget) != progress-overflow-small.html progress-nobar.html
+pref(layout.css.moz-appearance.enabled,true) pref(layout.css.appearance.enabled,true) skip-if(cocoaWidget) skip-if(winWidget) == progress-overflow.html progress-overflow-ref.html
+pref(layout.css.moz-appearance.enabled,true) pref(layout.css.appearance.enabled,true) fails-if(Android) skip-if(cocoaWidget) skip-if(winWidget) != progress-overflow-small.html progress-nobar.html

 == 676387-1.xul 676387-1-ref.xul
--- a/layout/style/nsCSSProps.cpp
+++ b/layout/style/nsCSSProps.cpp
@ -742,8 +742,8 @@ const KTableEntry nsCSSProps::kAnimationPlayStateKTable[] = {
 };

 const KTableEntry nsCSSProps::kAppearanceKTable[] = {
-  { eCSSKeyword_auto,    NS_THEME_AUTO },
  { eCSSKeyword_none,    NS_THEME_NONE },
+  { eCSSKeyword_auto,    NS_THEME_AUTO },
  { eCSSKeyword_UNKNOWN, -1 }
 };

--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@ -6075,12 +6075,12 @@ nsRuleNode::ComputeDisplayData(void* aStartStruct,
           parentDisplay->mMozAppearance,
           NS_THEME_NONE);

-  // appearance: auto | none
+  // appearance: none | auto
  SetValue(*aRuleData->ValueForAppearance(),
           display->mAppearance, conditions,
           SETVAL_ENUMERATED | SETVAL_UNSET_INITIAL,
           parentDisplay->mAppearance,
-           NS_THEME_AUTO);
+           NS_THEME_NONE);

  // binding: url, none, inherit
  const nsCSSValue* bindingValue = aRuleData->ValueForBinding();
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@ -3341,7 +3341,7 @@ nsStyleDisplay::nsStyleDisplay(const nsPresContext* aContext)
  , mOriginalDisplay(StyleDisplay::Inline)
  , mContain(NS_STYLE_CONTAIN_NONE)
  , mMozAppearance(NS_THEME_NONE)
-  , mAppearance(NS_THEME_AUTO)
+  , mAppearance(NS_THEME_NONE)
  , mPosition(NS_STYLE_POSITION_STATIC)
  , mFloat(StyleFloat::None)
  , mOriginalFloat(StyleFloat::None)
--- a/layout/style/res/forms.css
+++ b/layout/style/res/forms.css
@ -88,6 +88,7 @@ label {

 input {
  -moz-appearance: textfield;
+  appearance: auto;
  /* The sum of border and padding on block-start and block-end
     must be the same here, for buttons, and for <select> (including its
     internal padding magic) */
@ -151,6 +152,7 @@ textarea {
  resize: both;
  -moz-binding: url("chrome://global/content/platformHTMLBindings.xml#textAreas");
  -moz-appearance: textfield-multiline;
+  appearance: auto;
  text-indent: 0;
  -moz-user-select: text;
  text-shadow: none;
@ -259,6 +261,7 @@ select {
  box-sizing: border-box;
  -moz-user-select: none;
  -moz-appearance: menulist;
+  appearance: auto;
  border-width: 2px;
  border-style: inset;
  text-indent: 0;
@ -285,6 +288,7 @@ select[size][multiple] {
  padding-inline-start: 0;
  padding-inline-end: 0;
  -moz-appearance: listbox;
+  appearance: auto;
 }

 select[size="0"],
@ -295,6 +299,7 @@ select[size="1"] {
  vertical-align: baseline;
  padding: 0;
  -moz-appearance: menulist;
+  appearance: auto;
 }

 select > button {
@ -305,6 +310,7 @@ select > button {
  background-repeat: no-repeat !important;
  background-position: center !important;
  -moz-appearance: menulist-button;
+  appearance: auto;

  /* Make sure to size correctly if the combobox has a non-auto height. */
  block-size: 100% ! important;
@ -557,6 +563,7 @@ input[type="file"]:dir(rtl) > xul|label {
 input[type="radio"] {
  display: inline-block;
  -moz-appearance: radio;
+  appearance: auto;
  margin-block-start: 3px;
  margin-block-end: 0px;
  margin-inline-start: 5px;
@ -567,6 +574,7 @@ input[type="radio"] {
 input[type="checkbox"] {
  display: inline-block;
  -moz-appearance: checkbox;
+  appearance: auto;
  margin-block-start: 3px;
  margin-block-end: 3px;
  margin-inline-start: 4px;
@ -674,6 +682,7 @@ input[type="reset"],
 input[type="button"],
 input[type="submit"] {
  -moz-appearance: button;
+  appearance: auto;
  /* The sum of border and padding on block-start and block-end
     must be the same here, for text inputs, and for <select>.
     Note -moz-focus-inner padding does not affect button size. */
@ -898,6 +907,7 @@ output:-moz-ui-invalid {

 progress {
  -moz-appearance: progressbar;
+  appearance: auto;
  display: inline-block;
  vertical-align: -0.2em;

@ -920,6 +930,7 @@ progress {
  box-sizing: border-box ! important;

  -moz-appearance: progresschunk;
+  appearance: auto;
  height: 100%;
  width: 100%;

@ -929,6 +940,7 @@ progress {

 meter {
  -moz-appearance: meterbar;
+  appearance: auto;
  display: inline-block;
  vertical-align: -0.2em;

@ -943,6 +955,7 @@ meter {
  overflow: visible ! important;

  -moz-appearance: meterchunk;
+  appearance: auto;
  height: 100%;
  width: 100%;
 }
@ -962,6 +975,7 @@ meter {

 input[type=range] {
  -moz-appearance: range;
+  appearance: auto;
  display: inline-block;
  inline-size: 12em;
  block-size: 1.3em;
@ -1079,6 +1093,7 @@ input[type=range]::-moz-range-thumb {
   * to get rid of it. The thumb's -moz-appearance is fixed.
   */
  -moz-appearance: range-thumb !important;
+  appearance: auto !important;
  /* Prevent styling that would change the type of frame we construct. */
  display: inline-block !important;
  float: none !important;
@ -1151,6 +1166,7 @@ input[type=number]::-moz-number-spin-box {
 input[type=number]::-moz-number-spin-up {
  writing-mode: horizontal-tb;
  -moz-appearance: spinner-upbutton;
+  appearance: auto;
  display: block; /* bug 926670 */
  flex: none;
  cursor: default;
@ -1169,6 +1185,7 @@ input[type=number]::-moz-number-spin-up {
 input[type=number]::-moz-number-spin-down {
  writing-mode: horizontal-tb;
  -moz-appearance: spinner-downbutton;
+  appearance: auto;
  display: block; /* bug 926670 */
  flex: none;
  cursor: default;
--- a/layout/style/res/number-control.css
+++ b/layout/style/res/number-control.css
@ -9,6 +9,7 @@

 input[type="number"] {
  -moz-appearance: number-input;
+  appearance: auto;
  /* Has to revert some properties applied by the generic input rule. */
  -moz-binding: none;
  inline-size: 20ch; /* It'd be nice if this matched the default inline-size
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@ -7871,8 +7871,8 @@ if (IsCSSPropertyPrefEnabled("layout.css.appearance.enabled")) {
    domProp: "appearance",
    inherited: false,
    type: CSS_TYPE_LONGHAND,
-    initial_values: [ "auto" ],
-    other_values: [ "none" ],
+    initial_values: [ "none" ],
+    other_values: [ "auto" ],
    invalid_values: [ "button" ]
  };
  gCSSProperties["-webkit-appearance"] = {
--- a/toolkit/content/minimal-xul.css
+++ b/toolkit/content/minimal-xul.css
@ -22,6 +22,7 @@
@namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */

 * {
+  appearance: auto; /* make -moz-appearance work on all XUL elements */
  -moz-user-focus: ignore;
  -moz-user-select: none;
  display: -moz-box;
--- a/widget/reftests/507947.html
+++ b/widget/reftests/507947.html
@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<div style="height: 100px; -moz-appearance: toolbar;"></div>
+<div style="height: 100px; -moz-appearance: toolbar; appearance: auto"></div>
--- a/widget/reftests/664925.xhtml
+++ b/widget/reftests/664925.xhtml
@ -1 +1 @@
-<html xmlns="http://www.w3.org/1999/xhtml"><div><td style="-moz-appearance: progressbar;"></td></div></html>
+<html xmlns="http://www.w3.org/1999/xhtml"><div><td style="-moz-appearance: progressbar; appearance: auto"></td></div></html>
--- a/widget/reftests/reftest.list
+++ b/widget/reftests/reftest.list
@ -1,6 +1,6 @@
-pref(layout.css.moz-appearance.enabled,true) skip-if(!cocoaWidget) != 507947.html about:blank
+pref(layout.css.moz-appearance.enabled,true) pref(layout.css.appearance.enabled,true) skip-if(!cocoaWidget) != 507947.html about:blank
 pref(layout.css.moz-appearance.enabled,true) == progressbar-fallback-default-style.html progressbar-fallback-default-style-ref.html
 fuzzy-if(Android,17,1120) == meter-native-style.html meter-native-style-ref.html
 skip-if(!cocoaWidget) == meter-vertical-native-style.html meter-vertical-native-style-ref.html # dithering
 pref(layout.css.moz-appearance.enabled,true) == meter-fallback-default-style.html meter-fallback-default-style-ref.html
-pref(layout.css.moz-appearance.enabled,true) load 664925.xhtml
+pref(layout.css.moz-appearance.enabled,true) pref(layout.css.appearance.enabled,true) load 664925.xhtml