Merge remote-tracking branch 'origin/tracking' into custom

caps/nsPrincipal.cpp

@@ -464,11 +464,16 @@ nsPrincipal::Write(nsIObjectOutputStream* aStream)
   rv = aStream->WriteStringZ(suffix.get());
   NS_ENSURE_SUCCESS(rv, rv);
 
-  nsCSPContext* testcsp = static_cast<nsCSPContext*>(mCSP.get());
-  if(testcsp) {
-    int csprefcnt = testcsp->AddRef();
-    testcsp->Release();
-    if(csprefcnt > 10) return NS_OK;
+  // This is an ugly hack to prevent re-entrancy calls into nsPrincipal::Write()
+  // because of repeat CSP processing.
+  // We refcount the context and if found 10+ refcounts on the same, skip writing
+  // the mCSP compound object.
+  // TODO: figure out exactly why this happens and fix the root cause.
+  nsCSPContext* CSPContext = static_cast<nsCSPContext*>(mCSP.get());
+  if(CSPContext) {
+    auto CSPDepth = CSPContext->AddRef();
+    CSPContext->Release();
+    if(CSPDepth > 10) return NS_OK;
   }
 
   rv = NS_WriteOptionalCompoundObject(aStream, mCSP,

devtools/client/responsive.html/index.css

@@ -78,7 +78,7 @@ html, body {
 }
 
 select {
-  -moz-appearance: none;
+  appearance: none;
   background-color: var(--theme-toolbar-background);
   background-image: var(--viewport-selection-arrow);
   background-position: 100% 50%;

devtools/client/themes/animationinspector.css

@@ -188,7 +188,7 @@ body {
 }
 
 #timeline-rate select.devtools-button {
-  -moz-appearance: none;
+  appearance: none;
   text-align: center;
   font-family: inherit;
   color: var(--theme-body-color);

devtools/client/themes/commandline.inc.css

@@ -34,7 +34,7 @@
 }
 
 #developer-toolbar {
-  -moz-appearance: none;
+  appearance: none;
   padding: 0;
   min-height: 32px;
   background-color: var(--gcli-background-color);
@@ -42,7 +42,7 @@
 }
 
 #developer-toolbar > toolbarbutton {
-  -moz-appearance: none;
+  appearance: none;
   border: none;
   background-color: transparent;
   margin: 0;
@@ -122,7 +122,7 @@ html|*#gcli-output-frame {
 #gcli-tooltip {
   border-width: 0;
   background-color: transparent;
-  -moz-appearance: none;
+  appearance: none;
 }
 
 .gclitoolbar-input-node,
@@ -140,7 +140,7 @@ html|*#gcli-output-frame {
 }
 
 .gclitoolbar-input-node {
-  -moz-appearance: none;
+  appearance: none;
   color: var(--gcli-input-color);
   background-color: var(--gcli-input-background);
   background-repeat: no-repeat;

devtools/client/themes/common.css

@@ -70,7 +70,7 @@ html|button, html|select {
 }
 
 .devtools-autocomplete-listbox {
-  -moz-appearance: none !important;
+  appearance: none !important;
   background-color: transparent;
   border-width: 0px !important;
   margin: 0;
@@ -243,7 +243,7 @@ checkbox:-moz-focusring {
 .devtools-menulist,
 .devtools-toolbarbutton,
 .devtools-button {
-  -moz-appearance: none;
+  appearance: none;
   background: transparent;
   min-height: 18px;
   text-shadow: none;
@@ -334,7 +334,7 @@ checkbox:-moz-focusring {
 
 /* Menu button styles (eg. web console filters) */
 .devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-button {
-  -moz-appearance: none;
+  appearance: none;
   color: inherit;
   border-width: 0;
   -moz-box-orient: horizontal;
@@ -351,7 +351,7 @@ checkbox:-moz-focusring {
 }
 
 .devtools-menulist > .menulist-dropmarker {
-  -moz-appearance: none;
+  appearance: none;
   display: -moz-box;
   list-style-image: url("chrome://devtools/skin/images/dropmarker.svg");
   -moz-box-align: center;
@@ -360,7 +360,7 @@ checkbox:-moz-focusring {
 
 .devtools-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
 .devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
-  -moz-appearance: none !important;
+  appearance: none !important;
   list-style-image: url("chrome://devtools/skin/images/dropmarker.svg");
   -moz-box-align: center;
   padding: 0 3px;
@@ -491,7 +491,7 @@ checkbox:-moz-focusring {
  * @TODO : Fix when https://bugzilla.mozilla.org/show_bug.cgi?id=1255116 lands
  */
 .menu-filter-button {
-  -moz-appearance: none;
+  appearance: none;
   background: rgba(128,128,128,0.1);
   border: none;
   border-radius: 2px;
@@ -519,7 +519,7 @@ checkbox:-moz-focusring {
 .devtools-textinput,
 .devtools-searchinput,
 .devtools-filterinput {
-  -moz-appearance: none;
+  appearance: none;
   margin: 1px 3px;
   border: 1px solid;
   border-radius: 2px;

devtools/client/themes/debugger.css

@@ -61,7 +61,7 @@
 /* Firebug theme uses breakpoint icon istead of a checkbox */
 
 .theme-firebug #sources-pane .dbg-breakpoint-checkbox .checkbox-check {
-  -moz-appearance: none;
+  appearance: none;
   border: none;
   background: url(chrome://devtools/skin/images/firebug/breakpoint.svg) no-repeat 50% 50%;
 }
@@ -326,7 +326,7 @@
 }
 
 .dbg-expression-button {
-  -moz-appearance: none;
+  appearance: none;
   border: none;
   background: none;
   text-decoration: underline;

devtools/client/themes/devtools-browser.css

@@ -18,7 +18,7 @@
 
 .devtools-eyedropper-panel {
   pointer-events: none;
-  -moz-appearance: none;
+  appearance: none;
   width: 156px;
   height: 120px;
   background-color: transparent;

devtools/client/themes/floating-scrollbars-dark-theme.css

@@ -7,7 +7,7 @@
    well as any overflow: scroll elements within the page, while excluding
    <select>. */
 *|*:not(html|select) > scrollbar {
-  -moz-appearance: none !important;
+  appearance: none !important;
   position: relative;
   background-color: transparent;
   background-image: none;
@@ -37,14 +37,14 @@
 
 *|*:not(html|select) > scrollbar thumb {
   background-color: rgba(170, 170, 170, .2) !important; /* --toolbar-tab-hover */
-  -moz-appearance: none !important;
+  appearance: none !important;
   border-width: 0px !important;
   border-radius: 3px !important;
 }
 
 *|*:root[platform="mac"] > scrollbar slider,
 *|*:root[platform="mac"] *|*:not(html|select) > scrollbar slider {
-  -moz-appearance: none !important;
+  appearance: none !important;
 }
 
 *|*:root[platform="win"] > scrollbar scrollbarbutton,

devtools/client/themes/floating-scrollbars-responsive-design.css

@@ -7,7 +7,7 @@
    well as any overflow: scroll elements within the page, while excluding
    <select>. */
 *|*:not(html|select) > scrollbar {
-  -moz-appearance: none !important;
+  appearance: none !important;
   position: relative;
   background-color: transparent;
   background-image: none;
@@ -31,11 +31,11 @@
 }
 
 *|*:not(html|select) > scrollbar slider {
-  -moz-appearance: none !important;
+  appearance: none !important;
 }
 
 *|*:not(html|select) > scrollbar thumb {
-  -moz-appearance: none !important;
+  appearance: none !important;
   background-color: rgba(0,0,0,0.2);
   border-width: 0px !important;
   border-radius: 3px !important;

devtools/client/themes/netmonitor.css

@@ -148,7 +148,7 @@
 }
 
 .requests-menu-header-button {
-  -moz-appearance: none;
+  appearance: none;
   background-color: transparent;
   border-image: linear-gradient(transparent 15%,
                                 var(--theme-splitter-color) 15%,

devtools/client/themes/projecteditor/projecteditor.css

@@ -11,13 +11,13 @@
 }
 
 .arrow {
-  -moz-appearance: treetwisty;
+  appearance: treetwisty;
   width: 20px;
   height: 20px;
 }
 
 .arrow[open] {
-  -moz-appearance: treetwistyopen;
+  appearance: treetwistyopen;
 }
 
 .arrow[invisible] {

devtools/client/themes/responsivedesign.inc.css

@@ -16,7 +16,7 @@
 }
 
 .devtools-responsiveui-toolbar {
-  -moz-appearance: none;
+  appearance: none;
   background: transparent;
   /* text color is textColor from dark theme, since no theme is applied to
    * the responsive toolbar.
@@ -29,7 +29,7 @@
 }
 
 .devtools-responsiveui-textinput {
-  -moz-appearance: none;
+  appearance: none;
   background: #333;
   color: #fff;
   border: 1px solid #111;
@@ -46,7 +46,7 @@
 
 .devtools-responsiveui-menulist,
 .devtools-responsiveui-toolbarbutton {
-  -moz-appearance: none;
+  appearance: none;
   -moz-box-align: center;
   min-width: 32px;
   min-height: 22px;
@@ -60,12 +60,12 @@
 }
 
 .devtools-responsiveui-menulist .menulist-editable-box {
-  -moz-appearance: none;
+  appearance: none;
   background-color: transparent;
 }
 
 .devtools-responsiveui-menulist html|*.menulist-editable-input {
-  -moz-appearance: none;
+  appearance: none;
   color: inherit;
   text-align: center;
 }
@@ -124,7 +124,7 @@
 }
 
 .devtools-responsiveui-menulist > .menulist-dropmarker {
-  -moz-appearance: none;
+  appearance: none;
   display: -moz-box;
   background-color: transparent;
   list-style-image: url("chrome://devtools/skin/images/dropmarker.svg");
@@ -134,7 +134,7 @@
 }
 
 .devtools-responsiveui-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-button {
-  -moz-appearance: none;
+  appearance: none;
   color: inherit;
   border-width: 0;
   border-inline-end: 1px solid hsla(210,8%,5%,.45);
@@ -152,7 +152,7 @@
 
 .devtools-responsiveui-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
 .devtools-responsiveui-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
-  -moz-appearance: none !important;
+  appearance: none !important;
   list-style-image: url("chrome://devtools/skin/images/dropmarker.svg");
   -moz-box-align: center;
   padding: 0 3px;
@@ -266,7 +266,7 @@
 }
 
 .devtools-responsiveui-hardware-buttons {
-  -moz-appearance: none;
+  appearance: none;
   padding: 20px;
 
   border: 1px solid #FFFFFF;
@@ -288,7 +288,7 @@
 
 .devtools-responsiveui-sleep-button {
   -moz-user-focus: ignore;
-  -moz-appearance: none;
+  appearance: none;
   /* compensate browserStack top padding */
   margin-top: -67px;
   margin-right: 10px;
@@ -316,7 +316,7 @@
 .devtools-responsiveui-volume-up-button,
 .devtools-responsiveui-volume-down-button {
   -moz-user-focus: ignore;
-  -moz-appearance: none;
+  appearance: none;
   border: 1px solid red;
   min-width: 8px;
   height: 40px;

devtools/client/themes/shadereditor.css

@@ -28,7 +28,7 @@
 }
 
 .side-menu-widget-item-checkbox {
-  -moz-appearance: none;
+  appearance: none;
   opacity: 0;
   transition: opacity .15s ease-out 0s;
 }
@@ -43,7 +43,7 @@
 }
 
 .side-menu-widget-item-checkbox .checkbox-check {
-  -moz-appearance: none;
+  appearance: none;
   background-image: url(images/item-toggle.svg);
   background-color: transparent;
   width: 16px;

devtools/client/themes/splitters.css

@@ -32,7 +32,7 @@
 
 .devtools-horizontal-splitter,
 .devtools-side-splitter {
-  -moz-appearance: none;
+  appearance: none;
   background-image: none;
   border: 0;
   border-style: solid;

devtools/client/themes/toolbars.css

@@ -45,7 +45,7 @@
 /* Toolbars */
 .devtools-toolbar,
 .devtools-sidebar-tabs tabs {
-  -moz-appearance: none;
+  appearance: none;
   padding: 0;
   border-width: 0;
   border-bottom-width: 1px;
@@ -91,13 +91,13 @@
 
 /* In-tools sidebar */
 .devtools-sidebar-tabs {
-  -moz-appearance: none;
+  appearance: none;
   margin: 0;
   height: 100%;
 }
 
 .devtools-sidebar-tabs > tabpanels {
-  -moz-appearance: none;
+  appearance: none;
   background: transparent;
   padding: 0;
   border: 0;
@@ -116,7 +116,7 @@
 }
 
 .devtools-sidebar-alltabs {
-  -moz-appearance: none;
+  appearance: none;
   height: 24px;
   line-height: 24px;
   padding: 0 4px;
@@ -136,7 +136,7 @@
 }
 
 .devtools-sidebar-tabs tabs > tab {
-  -moz-appearance: none;
+  appearance: none;
   /* We want to match the height of a toolbar with a toolbarbutton
    * First, we need to replicated the padding of toolbar (4px),
    * then we need to take the border of the buttons into account (1px).

devtools/client/themes/toolbox.css

@@ -41,7 +41,7 @@
 /* Toolbox tabbar */
 
 .devtools-tabbar {
-  -moz-appearance: none;
+  appearance: none;
   min-height: 24px;
   border: 0px solid;
   border-bottom-width: 1px;
@@ -67,7 +67,7 @@
 /* Toolbox tabs */
 
 .devtools-tab {
-  -moz-appearance: none;
+  appearance: none;
   -moz-binding: url("chrome://global/content/bindings/general.xml#control-item");
   -moz-box-align: center;
   min-width: 32px;
@@ -224,7 +224,7 @@
 
 #toolbox-controls > button,
 #toolbox-dock-buttons > button {
-  -moz-appearance: none;
+  appearance: none;
   border: none;
   margin: 0 4px;
   min-width: 16px;

devtools/client/themes/tooltips.css

@@ -108,7 +108,7 @@
 }
 
 .tooltip-xul-wrapper {
-  -moz-appearance: none;
+  appearance: none;
   background: transparent;
   overflow: visible;
   border-style: none;

devtools/client/themes/webaudioeditor.css

@@ -125,7 +125,7 @@ text {
 .web-audio-inspector .error {
   background-image: url(images/alerticon-warning.png);
   background-size: 13px 12px;
-  -moz-appearance: none;
+  appearance: none;
   opacity: 0;
   transition: opacity .5s ease-out 0s;
 }

devtools/client/themes/webconsole.css

@@ -424,7 +424,7 @@ a {
   padding: 0;
   padding-inline-start: 20px;
   margin: 0;
-  -moz-appearance: none;
+  appearance: none;
   background-color: transparent;
 }
 

devtools/client/themes/widgets.css

@@ -122,7 +122,7 @@
 
 .scrollbutton-up,
 .scrollbutton-down {
-  -moz-appearance: none;
+  appearance: none;
   background: transparent;
   box-shadow: none;
   border: none;
@@ -133,7 +133,7 @@
 
 .scrollbutton-up > .toolbarbutton-icon,
 .scrollbutton-down > .toolbarbutton-icon {
-  -moz-appearance: none;
+  appearance: none;
   width: 7px;
   height: 16px;
   background-size: 14px 16px;
@@ -190,7 +190,7 @@
 
 .breadcrumbs-widget-item {
   background-color: transparent;
-  -moz-appearance: none;
+  appearance: none;
   min-height: 24px;
   min-width: 65px;
   margin: 0;

gfx/src/nsITheme.h

@@ -51,7 +51,7 @@ public:
    * Draw the actual theme background.
    * @param aContext the context to draw into
    * @param aFrame the frame for the widget that we're drawing
-   * @param aWidgetType the -moz-appearance value to draw
+   * @param aWidgetType the appearance value to draw
    * @param aRect the rectangle defining the area occupied by the widget
    * @param aDirtyRect the rectangle that needs to be drawn
    */
@@ -148,8 +148,8 @@ public:
   /**
    * ThemeGeometryType values are used for describing themed nsIFrames in
    * calls to nsIWidget::UpdateThemeGeometries. We don't simply pass the
-   * -moz-appearance value ("widget type") of the frame because the widget may
-   * want to treat different frames with the same -moz-appearance differently
+   * appearance value ("widget type") of the frame because the widget may
+   * want to treat different frames with the same appearance differently
    * based on other properties of the frame. So we give the theme a first look
    * at the frame in nsITheme::ThemeGeometryTypeForWidget and pass the
    * returned ThemeGeometryType along to the widget.

gfx/thebes/gfxPlatformGtk.cpp

@@ -212,7 +212,7 @@ gfxPlatformGtk::GetCommonFallbackFonts(uint32_t aCh, uint32_t aNextCh,
                                        nsTArray<const char*>& aFontList)
 {
     EmojiPresentation emoji = GetEmojiPresentation(aCh);
-    EmojiPresentation eNext = GetEmojiPresentation(aNextCh);
+    EmojiPresentation eNext = GetEmojiPresentation(aNextCh, true);
     if (aNextCh != kVariationSelector15 &&
         emoji != EmojiPresentation::TextOnly &&
         (emoji != EmojiPresentation::TextDefault ||

gfx/thebes/gfxPlatformMac.cpp

@@ -191,7 +191,7 @@ gfxPlatformMac::GetCommonFallbackFonts(uint32_t aCh, uint32_t aNextCh,
                                        nsTArray<const char*>& aFontList)
 {
     EmojiPresentation emoji = GetEmojiPresentation(aCh);
-    EmojiPresentation eNext = GetEmojiPresentation(aNextCh);
+    EmojiPresentation eNext = GetEmojiPresentation(aNextCh, true);
     if (aNextCh != kVariationSelector15 &&
         emoji != EmojiPresentation::TextOnly &&
         (emoji != EmojiPresentation::TextDefault ||

gfx/thebes/gfxWindowsPlatform.cpp

@@ -638,7 +638,7 @@ gfxWindowsPlatform::GetCommonFallbackFonts(uint32_t aCh, uint32_t aNextCh,
                                            nsTArray<const char*>& aFontList)
 {
     EmojiPresentation emoji = GetEmojiPresentation(aCh);
-    EmojiPresentation eNext = GetEmojiPresentation(aNextCh);
+    EmojiPresentation eNext = GetEmojiPresentation(aNextCh, true);
     if (aNextCh != kVariationSelector15 &&
         emoji != EmojiPresentation::TextOnly &&
         (emoji != EmojiPresentation::TextDefault ||

intl/unicharutil/util/nsUnicodeProperties.cpp

@@ -275,10 +275,10 @@ ClusterIterator::Next()
             IsClusterExtender(ch) ||
             IsEmojiClusterExtender(ch) ||
             (baseIsEmoji && prevWasZwj &&
-             ((GetEmojiPresentation(ch) == EmojiDefault) ||
-              (GetEmojiPresentation(ch) == EmojiComponent) ||
-              (GetEmojiPresentation(ch) == TextDefault &&
-               GetEmojiPresentation(aExtCh) == EmojiComponent)));
+             ((GetEmojiPresentation(ch, true) == EmojiDefault) ||
+              (GetEmojiPresentation(ch, true) == EmojiComponent) ||
+              (GetEmojiPresentation(ch, true) == TextDefault &&
+               GetEmojiPresentation(aExtCh, true) == EmojiComponent)));
         if (!extendCluster) {
             break;
         }
@@ -346,7 +346,7 @@ ClusterReverseIterator::Next()
             }
             break;
         }
-        nextWasComponent = (GetEmojiPresentation(ch) == EmojiComponent);
+        nextWasComponent = (GetEmojiPresentation(ch, true) == EmojiComponent);
     } while ((mPos - tRel) > mLimit);
     mPos -= tPos;
 

intl/unicharutil/util/nsUnicodeProperties.h

@@ -178,19 +178,37 @@ IsDefaultIgnorable(uint32_t aCh)
 }
 
 inline EmojiPresentation
-GetEmojiPresentation(uint32_t aCh)
+GetEmojiPresentation(uint32_t aCh, bool bExt = false)
 {
+  // tr51 Annex A
+
+  // "Implementations must not [...] assume that all Emoji_Component
+  //  characters are also Emoji"
   if (u_hasBinaryProperty(aCh, UCHAR_EMOJI_COMPONENT)) {
     return EmojiComponent;
   }
-  if (u_hasBinaryProperty(aCh, UCHAR_EMOJI) &&
-     !u_hasBinaryProperty(aCh, UCHAR_EMOJI_PRESENTATION)) {
-    return TextDefault;
+  // "All characters in emoji sequences are either Emoji
+  //  or Emoji_Component"
+  // Anything that wasn't caught by Emoji_Component and
+  // isn't caught by Emoji must be text.
+  if (!u_hasBinaryProperty(aCh, UCHAR_EMOJI)) {
+    return TextOnly;
   }
-  if (u_hasBinaryProperty(aCh, UCHAR_EXTENDED_PICTOGRAPHIC)) {
+  // "If Emoji=No, then Emoji_Presentation=No"
+  // Emoji=No was filtered out above, so Emoji_Presentation may be Yes?
+  if (u_hasBinaryProperty(aCh, UCHAR_EMOJI_PRESENTATION)) {
     return EmojiDefault;
   }
-  return TextOnly;
+  // "Characters that are used to future-proof segmentation"
+  // Emoji=Yes, Emoji_Presentation=No, what about Extended_Pictographic?
+  // Apply only when part of a cluster.
+  if (bExt && u_hasBinaryProperty(aCh, UCHAR_EXTENDED_PICTOGRAPHIC)) {
+    return EmojiDefault;
+  }
+  // Still an emoji, but...
+  // Not Emoji_Presentation
+  // Not Extended_Pictographic in an extended setting
+  return TextDefault;
 }
 
 // returns the simplified Gen Category as defined in nsIUGenCategory

js/src/builtin/intl/LanguageTagGenerated.cpp

@@ -488,9 +488,9 @@ void js::intl::LanguageTag::performComplexRegionMappings() {
     else if (language().equalTo("auz") ||
              language().equalTo("kaa") ||
              language().equalTo("sog") ||
-             (language().equalTo("und") && script().equalTo("Sogo")) ||
              (language().equalTo("und") && script().equalTo("Chrs")) ||
              (language().equalTo("und") && script().equalTo("Sogd")) ||
+             (language().equalTo("und") && script().equalTo("Sogo")) ||
              language().equalTo("uz") ||
              language().equalTo("xco")) {
       setRegion("UZ");
@@ -533,9 +533,9 @@ void js::intl::LanguageTag::performComplexRegionMappings() {
         language().equalTo("sdb") ||
         language().equalTo("sdf") ||
         language().equalTo("syr") ||
-        (language().equalTo("und") && script().equalTo("Xsux")) ||
+        (language().equalTo("und") && script().equalTo("Hatr")) ||
         (language().equalTo("und") && script().equalTo("Syrc")) ||
-        (language().equalTo("und") && script().equalTo("Hatr"))) {
+        (language().equalTo("und") && script().equalTo("Xsux"))) {
       setRegion("IQ");
     }
     else {
@@ -652,9 +652,9 @@ void js::intl::LanguageTag::performComplexRegionMappings() {
     else if (language().equalTo("auz") ||
              language().equalTo("kaa") ||
              language().equalTo("sog") ||
-             (language().equalTo("und") && script().equalTo("Sogo")) ||
              (language().equalTo("und") && script().equalTo("Chrs")) ||
              (language().equalTo("und") && script().equalTo("Sogd")) ||
+             (language().equalTo("und") && script().equalTo("Sogo")) ||
              language().equalTo("uz") ||
              language().equalTo("xco")) {
       setRegion("UZ");

js/src/builtin/intl/make_intl_data.py

@@ -295,12 +295,11 @@ void js::intl::LanguageTag::performComplexRegionMappings() {
 
         first_case = True
         for replacement_region in replacement_regions:
-            replacement_language_script = sorted(((language, script)
-                                                  for (language, script, region) in (
-                                                      non_default_replacements
-                                                  )
-                                                  if region == replacement_region),
-                                                 key=itemgetter(0))
+            replacement_language_script = sorted((language, script)
+                                                 for (language, script, region) in (
+                                                     non_default_replacements
+                                                 )
+                                                 if region == replacement_region)
 
             if_kind = u"if" if first_case else u"else if"
             first_case = False
@@ -1318,6 +1317,23 @@ def updateCLDRLangTags(args):
     out = args.out
     filename = args.file
 
+    # Determine current CLDR version from ICU.
+    if version is None:
+        icuDir = os.path.join(topsrcdir, "intl/icu/source")
+        if not os.path.isdir(icuDir):
+            raise RuntimeError("not a directory: {}".format(icuDir))
+
+        reVersion = re.compile(r'\s*cldrVersion\{"(\d+(?:\.\d+)?)"\}')
+
+        for line in flines(os.path.join(icuDir, "data/misc/supplementalData.txt")):
+            m = reVersion.match(line)
+            if m:
+                version = m.group(1)
+                break
+
+        if version is None:
+            raise RuntimeError("can't resolve CLDR version")
+
     url = url.replace("<VERSION>", version)
 
     print("Arguments:")
@@ -2276,7 +2292,6 @@ if __name__ == "__main__":
                                              help="Update CLDR language tags data")
     parser_cldr_tags.add_argument("--version",
                                   metavar="VERSION",
-                                  required=True,
                                   help="CLDR version number")
     parser_cldr_tags.add_argument("--url",
                                   metavar="URL",

layout/base/ScrollStyles.h

@@ -19,7 +19,7 @@ namespace mozilla {
 struct ScrollStyles
 {
   // Always one of NS_STYLE_OVERFLOW_SCROLL, NS_STYLE_OVERFLOW_HIDDEN,
-  // or NS_STYLE_OVERFLOW_AUTO.
+  // NS_STYLE_OVERFLOW_CLIP or NS_STYLE_OVERFLOW_AUTO.
   uint8_t mHorizontal;
   uint8_t mVertical;
   // Always one of NS_STYLE_SCROLL_BEHAVIOR_AUTO or

layout/base/nsDisplayList.h

@@ -653,7 +653,7 @@ public:
    * display list, except for themed widgets which are transformed or have
    * effects applied to them (e.g. CSS opacity or filters).
    *
-   * @param aWidgetType the -moz-appearance value for the themed widget
+   * @param aWidgetType the appearance value for the themed widget
    * @param aRect the device-pixel rect relative to the widget's displayRoot
    * for the themed widget
    */
@@ -1068,7 +1068,7 @@ public:
   void SetGlassDisplayItem(nsDisplayItem* aItem) {
     if (mGlassDisplayItem) {
       // Web pages or extensions could trigger this by using
-      // -moz-appearance:win-borderless-glass etc on their own elements.
+      // appearance:win-borderless-glass etc on their own elements.
       // Keep the first one, since that will be the background of the root
       // window
       NS_WARNING("Multiple glass backgrounds found?");

layout/base/nsPresContext.cpp

@@ -1334,6 +1334,30 @@ nsPresContext::ScreenSizeInchesForFontInflation(bool* aChanged)
   return deviceSizeInches;
 }
 
+// CheckOverflow() is only called on viewport elements (roots and <body> elements, see
+// GetPropagatedScrollStylesForViewport() below).
+// if this ever changes, we need to pass a bool here to indicate whether we are a root/<body> or not,
+// and adjust logic as-necessary.
+// XXX: this only checks overflow-x; it's unclear whether viewport checks truly only need to be
+// checked for y-scrolling, or if the same should apply for x-scrolling. It's certainly the common
+// case for sites specifying `clip` on whole-doc elements.
+//
+// Logic breakdown:
+// https://www.w3.org/TR/2025/WD-css-overflow-3-20251007/#overflow-propagation
+// "user agents must instead apply the overflow-* values of the first [visible html/body] child
+//  element to the viewport. The element from which the value is propagated must then have a
+//  used overflow value of `visible`." AND
+// "If `visible` is applied to the viewport, it must be interpreted as `auto`.
+//  If `clip` is applied to the viewport, it must be interpreted as `hidden`."
+// This is a lot of unnecessary juggling in the spec, but goes like this:
+// 1. Webmaster sets overflow-x to `clip` on root doc or <body>
+// 2. Spec says this should now apply to the viewport, not the element, triggering special handling (4)
+// 3. The other axis must now be set to `visible` instead of `unset` (so far, so good, consistent behavior)
+//    `visible` is an "unscrollable property" which would mandate ScrollStyles(hidden, hidden) here.
+// 4. **However**, because it's the viewport, overflow-y must be changed **again** to `auto`
+// So if unspecified, the spec says `unset` (unscrollable because clip) -> `visible` (unscrollable) ->
+// `auto` (scrollable) if propagated to the viewport (but not any other element where it remains unscrollable).
+// See Issue #2583
 static bool
 CheckOverflow(const nsStyleDisplay* aDisplay, ScrollStyles* aStyles)
 {
@@ -1352,7 +1376,8 @@ CheckOverflow(const nsStyleDisplay* aDisplay, ScrollStyles* aStyles)
 
   if (aDisplay->mOverflowX == NS_STYLE_OVERFLOW_CLIP) {
     *aStyles = ScrollStyles(NS_STYLE_OVERFLOW_HIDDEN,
-                               NS_STYLE_OVERFLOW_HIDDEN, aDisplay);
+                            NS_STYLE_OVERFLOW_AUTO,
+                            aDisplay);
   } else {
     *aStyles = ScrollStyles(aDisplay);
   }
@@ -1656,7 +1681,7 @@ nsPresContext::ThemeChangedInternal()
   // :-moz-system-metric selectors (which requires eRestyle_Subtree).
   // Changes in theme can change system colors (whose changes are
   // properly reflected in computed style data), system fonts (whose
-  // changes are not), and -moz-appearance (whose changes likewise are
+  // changes are not), and appearance (whose changes likewise are
   // not), so we need to reflow.
   MediaFeatureValuesChanged(eRestyle_Subtree, NS_STYLE_HINT_REFLOW);
 

layout/forms/nsNumberControlFrame.cpp

@@ -418,7 +418,7 @@ nsNumberControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 
   if (StyleDisplay()->mAppearance == NS_THEME_TEXTFIELD) {
     // The author has elected to hide the spinner by setting this
-    // -moz-appearance. We will reframe if it changes.
+    // appearance. We will reframe if it changes.
     return rv;
   }
 

layout/style/nsCSSPropAliasList.h

@@ -254,6 +254,10 @@ CSS_PROP_ALIAS(-moz-tab-size,
                tab_size,
                MozTabSize,
                "")
+CSS_PROP_ALIAS(-moz-appearance,
+               appearance,
+               MozAppearance,
+               "layout.css.prefixes.appearance")
 
 CSS_PROP_ALIAS(-moz-user-select,
                user_select,

layout/style/nsCSSPropList.h

@@ -461,9 +461,9 @@ CSS_PROP_DISPLAY(
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_None)
 CSS_PROP_DISPLAY(
-    -moz-appearance,
     appearance,
-    CSS_PROP_DOMPROP_PREFIXED(Appearance),
+    appearance,
+    Appearance,
     CSS_PROPERTY_PARSE_VALUE,
     "",
     VARIANT_HK,

layout/style/nsStyleStruct.cpp

@@ -3193,8 +3193,8 @@ nsStyleDisplay::CalcDifference(const nsStyleDisplay& aNewData) const
       (mAppearance != NS_THEME_TEXTFIELD &&
        aNewData.mAppearance == NS_THEME_TEXTFIELD)) {
     // This is for <input type=number> where we allow authors to specify a
-    // |-moz-appearance:textfield| to get a control without a spinner. (The
-    // spinner is present for |-moz-appearance:number-input| but also other
+    // |appearance:textfield| to get a control without a spinner. (The
+    // spinner is present for |appearance:number-input| but also other
     // values such as 'none'.) We need to reframe since we want to use
     // nsTextControlFrame instead of nsNumberControlFrame if the author
     // specifies 'textfield'.

layout/style/res/forms.css

@@ -83,7 +83,7 @@ label {
    need to match textfield background/border values here */
 
 input {
-  -moz-appearance: textfield;
+  appearance: textfield;
   /* 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) */
@@ -146,7 +146,7 @@ textarea {
   cursor: text;
   resize: both;
   -moz-binding: url("chrome://global/content/platformHTMLBindings.xml#textAreas");
-  -moz-appearance: textfield-multiline;
+  appearance: textfield-multiline;
   text-indent: 0;
   user-select: text;
   text-shadow: none;
@@ -241,7 +241,7 @@ select {
   cursor: default;
   box-sizing: border-box;
   user-select: none;
-  -moz-appearance: menulist;
+  appearance: menulist;
   border-width: 2px;
   border-style: inset;
   text-indent: 0;
@@ -267,7 +267,7 @@ select[size][multiple] {
   vertical-align: text-bottom;
   padding-inline-start: 0;
   padding-inline-end: 0;
-  -moz-appearance: listbox;
+  appearance: listbox;
 }
 
 select[size="0"],
@@ -277,7 +277,7 @@ select[size="1"] {
   color: -moz-ComboboxText;
   vertical-align: baseline;
   padding: 0;
-  -moz-appearance: menulist;
+  appearance: menulist;
 }
 
 select > button {
@@ -287,7 +287,7 @@ select > button {
   background-image: url("arrow.gif") !important;
   background-repeat: no-repeat !important;
   background-position: center !important;
-  -moz-appearance: menulist-button;
+  appearance: menulist-button;
 
   /* Make sure to size correctly if the combobox has a non-auto height. */
   block-size: 100% ! important;
@@ -439,7 +439,7 @@ optgroup:disabled {
 
 /* hidden inputs */
 input[type="hidden"] {
-  -moz-appearance: none;
+  appearance: none;
   display: none !important;
   padding: 0;
   border: 0;
@@ -450,7 +450,7 @@ input[type="hidden"] {
 
 /* image buttons */
 input[type="image"] {
-  -moz-appearance: none;
+  appearance: none;
   padding: 0;
   border: none;
   background-color: transparent;
@@ -478,7 +478,7 @@ input[type="file"] {
   color: inherit;
 
   /* Revert rules which apply on all inputs. */
-  -moz-appearance: none;
+  appearance: none;
   -moz-binding: none;
   cursor: default;
 
@@ -534,22 +534,22 @@ input[type="file"]:dir(rtl) > xul|label {
 
 /* radio buttons */
 input[type="radio"] {
-  -moz-appearance: radio;
+  appearance: radio;
   margin-block-start: 3px;
   margin-block-end: 0px;
   margin-inline-start: 5px;
   margin-inline-end: 3px;
-  border-radius: 100% !important;
+  border-radius: 100%;
 }
 
 /* check boxes */
 input[type="checkbox"] {
-  -moz-appearance: checkbox;
+  appearance: checkbox;
   margin-block-start: 3px;
   margin-block-end: 3px;
   margin-inline-start: 4px;
   margin-inline-end: 3px;
-  border-radius: 0 !important;
+  border-radius: 0;
 }
 
 /* common features of radio buttons and check boxes */
@@ -565,12 +565,12 @@ input[type="checkbox"] {
   inline-size: 13px;
   block-size: 13px;
   cursor: default;
-  padding: 0 !important;
+  padding: 0;
   -moz-binding: none;
-  /* same colors as |input| rule, but |!important| this time. */
-  background-color: -moz-Field ! important;
-  color: -moz-FieldText ! important;
-  border: 2px inset ThreeDLightShadow ! important;
+  /* same colors as |input| rule. */
+  background-color: -moz-Field;
+  color: -moz-FieldText;
+  border: 2px inset ThreeDLightShadow;
 }
 
 input[type="radio"]:disabled,
@@ -582,10 +582,10 @@ input[type="checkbox"]:disabled:active,
 input[type="checkbox"]:disabled:hover,
 input[type="checkbox"]:disabled:hover:active {
   padding: 1px;
-  border: 1px inset ThreeDShadow ! important;
-  /* same as above, but !important */
-  color: GrayText ! important;
-  background-color: ThreeDFace ! important;
+  border: 1px inset ThreeDShadow;
+  /* same as above */
+  color: GrayText;
+  background-color: ThreeDFace;
   cursor: inherit;
 }
 
@@ -601,8 +601,8 @@ input[type="radio"]:-moz-focusring {
 
 input[type="checkbox"]:hover:active,
 input[type="radio"]:hover:active {
-  background-color: ThreeDFace ! important;
-  border-style: inset !important;
+  background-color: ThreeDFace;
+  border-style: inset;
 }
 
 input[type="search"] {
@@ -621,7 +621,7 @@ input[type="color"]:-moz-system-metric(color-picker-available),
 input[type="reset"],
 input[type="button"],
 input[type="submit"] {
-  -moz-appearance: button;
+  appearance: button;
   /* 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. */
@@ -855,11 +855,11 @@ output:-moz-ui-invalid {
 }
 
 progress {
-  -moz-appearance: progressbar;
+  appearance: progressbar;
   display: inline-block;
   vertical-align: -0.2em;
 
-  /* Default style in case of there is -moz-appearance: none; */
+  /* Default style in case of there is appearance: none; */
   border: 2px solid;
   /* #e6e6e6 is a light gray. */
   -moz-border-top-colors: ThreeDShadow #e6e6e6;
@@ -877,16 +877,16 @@ progress {
   overflow: visible ! important;
   box-sizing: border-box ! important;
 
-  -moz-appearance: progresschunk;
+  appearance: progresschunk;
   height: 100%;
   width: 100%;
 
-  /* Default style in case of there is -moz-appearance: none; */
+  /* Default style in case of there is appearance: none; */
   background-color: #0064b4; /* blue */
 }
 
 meter {
-  -moz-appearance: meterbar;
+  appearance: meterbar;
   display: inline-block;
   vertical-align: -0.2em;
 
@@ -900,7 +900,7 @@ meter {
   position: static ! important;
   overflow: visible ! important;
 
-  -moz-appearance: meterchunk;
+  appearance: meterchunk;
   height: 100%;
   width: 100%;
 }
@@ -919,7 +919,7 @@ meter {
 }
 
 input[type=range] {
-  -moz-appearance: range;
+  appearance: range;
   display: inline-block;
   inline-size: 12em;
   block-size: 1.3em;
@@ -1033,10 +1033,10 @@ input[type=range]::-moz-range-progress {
  * properties are ignored.
  */
 input[type=range]::-moz-range-thumb {
-  /* Native theming is atomic for range. Set -moz-appearance on the range
-   * to get rid of it. The thumb's -moz-appearance is fixed.
+  /* Native theming is atomic for range. Set appearance on the range
+   * to get rid of it. The thumb's appearance is fixed.
    */
-  -moz-appearance: range-thumb !important;
+  appearance: range-thumb !important;
   /* Prevent styling that would change the type of frame we construct. */
   display: inline-block !important;
   float: none !important;
@@ -1066,7 +1066,7 @@ input[type=number]::-moz-number-text {
   display: block; /* Flex items must be block-level. Normally we do fixup in
                      the style system to ensure this, but that fixup is disabled
                      inside of form controls. So, we hardcode display here. */
-  -moz-appearance: none;
+  appearance: none;
   /* work around autofocus bug 939248 on initial load */
   -moz-user-modify: read-write;
   /* This pseudo-element is also an 'input' element (nested inside and
@@ -1108,7 +1108,7 @@ input[type=number]::-moz-number-spin-box {
 
 input[type=number]::-moz-number-spin-up {
   writing-mode: horizontal-tb;
-  -moz-appearance: spinner-upbutton;
+  appearance: spinner-upbutton;
   display: block; /* bug 926670 */
   flex: none;
   cursor: default;
@@ -1126,7 +1126,7 @@ input[type=number]::-moz-number-spin-up {
 
 input[type=number]::-moz-number-spin-down {
   writing-mode: horizontal-tb;
-  -moz-appearance: spinner-downbutton;
+  appearance: spinner-downbutton;
   display: block; /* bug 926670 */
   flex: none;
   cursor: default;

layout/style/res/number-control.css

@@ -8,7 +8,7 @@
  */
 
 input[type="number"] {
-  -moz-appearance: number-input;
+  appearance: number-input;
   /* 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

layout/style/test/manual/appearance-unprefixed-test.html

@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Appearance styling test</title>
+    <style>
+      input[type="checkbox"] {
+        appearance: none; /* remove default appearance on browsers */
+        width: 20px;
+        height: 20px;
+        border: 2px solid #333;
+        border-radius: 8px;
+        outline: none;
+        cursor: pointer;
+        margin-right: 10px;
+        transition: 500ms;
+      }
+      input[type="checkbox"]:checked {
+        background: #A0FFA0;
+        border-radius: 4px;
+      }
+      input[type="checkbox"]:checked:before {
+        content: "\2714"; /* Unicode checkmark symbol */
+        display: block;
+        text-align: center;
+        font-size: 14px;
+        line-height: 16px;
+        color: #fff;
+        background-color: #333;
+        border-radius: 2px;
+        width: 20px;
+        height: 20px;
+      }
+    </style>
+  </head>
+  <body>
+    <input type="checkbox" id="myCheckbox" name="myCheckbox" />
+    <label for="myCheckbox">Checkbox</label>
+  </body>
+</html>

layout/svg/svg.css

@@ -32,7 +32,7 @@ svg:not(:root), symbol, image, marker, pattern, foreignObject {
 }
 
 foreignObject {
-  -moz-appearance: none ! important;
+  appearance: none ! important;
   margin: 0 ! important;
   padding: 0 ! important;
   border-width: 0 ! important;
@@ -41,7 +41,7 @@ foreignObject {
 
 @media all and (-moz-is-resource-document) {
  foreignObject *|* {
-   -moz-appearance: none !important;
+   appearance: none !important;
  }
 }
 

layout/xul/tree/nsTreeBodyFrame.cpp

@@ -2066,7 +2066,7 @@ nsTreeBodyFrame::GetTwistyRect(int32_t aRowIndex,
   // determine the twisty rect's true width.  This is done by examining the style context for
   // a width first.  If it has one, we use that.  If it doesn't, we use the image's natural width.
   // If the image hasn't loaded and if no width is specified, then we just bail. If there is
-  // a -moz-appearance involved, adjust the rect by the minimum widget size provided by
+  // an `appearance` involved, adjust the rect by the minimum widget size provided by
   // the theme implementation.
   aImageRect = GetImageSize(aRowIndex, aColumn, true, aTwistyContext);
   if (aImageRect.height > aTwistyRect.height)
@@ -2855,8 +2855,8 @@ nsTreeBodyFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
   // properly, we also need the tree to be themed as a source list.
   if (selection && treeFrame && theme &&
       treeFrame->StyleDisplay()->mAppearance == NS_THEME_MAC_SOURCE_LIST) {
-    // Loop through our onscreen rows. If the row is selected and a
-    // -moz-appearance is provided, RegisterThemeGeometry might be necessary.
+    // Loop through our onscreen rows. If the row is selected and an
+    // `appearance` is provided, RegisterThemeGeometry might be necessary.
     const auto end = std::min(mRowCount, LastVisibleRow() + 1);
     for (auto i = FirstVisibleRow(); i < end; i++) {
       bool isSelected;
@@ -3197,7 +3197,7 @@ nsTreeBodyFrame::PaintSeparator(int32_t              aRowIndex,
 
   DrawResult result = DrawResult::SUCCESS;
 
-  // use -moz-appearance if provided.
+  // use appearance if provided.
   if (useTheme) {
     nsRect dirty;
     dirty.IntersectRect(aSeparatorRect, aDirtyRect);

mailnews/db/gloda/content/glodacomplete.css

@@ -13,7 +13,7 @@ panel[type="glodacomplete-richlistbox"] {
 .autocomplete-richlistbox {
   -moz-binding: url("chrome://global/content/bindings/autocomplete.xml#autocomplete-richlistbox");
   -moz-user-focus: ignore;
-  -moz-appearance: none;
+  appearance: none;
 }
 
 .autocomplete-richlistbox > scrollbox {

modules/libpref/init/all.js

@@ -1236,6 +1236,10 @@ pref("privacy.popups.disable_from_plugins", 2);
 
 // Send "Sec-GPC" HTTP header, disabled by default
 pref("privacy.GPCheader.enabled",    false);
+
+// By default, do not clear domain passwords for "Forget about site"
+pref("privacy.forgetaboutsite.clearPasswords", false);
+
 // Enforce tracking protection in all modes
 pref("privacy.trackingprotection.enabled",  false);
 // Enforce tracking protection in Private Browsing mode
@@ -2600,6 +2604,7 @@ pref("layout.css.prefixes.animations", true);
 pref("layout.css.prefixes.box-sizing", true);
 pref("layout.css.prefixes.font-features", true);
 pref("layout.css.prefixes.gradients", true);
+pref("layout.css.prefixes.appearance", true);
 
 // Are webkit-prefixed properties & property-values supported?
 pref("layout.css.prefixes.webkit", true);

toolkit/content/menulist.css

@@ -5,7 +5,7 @@
 @namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */
 
 html|*.menulist-editable-input {
-  -moz-appearance: none !important;
+  appearance: none !important;
   background: transparent ! important;
   -moz-box-flex: 1;
 }

toolkit/content/textbox.css

@@ -6,7 +6,7 @@
 @namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */
 
 html|*.textbox-input {
-  -moz-appearance: none !important;
+  appearance: none !important;
   text-align: inherit;
   text-shadow: inherit;
   box-sizing: border-box;
@@ -14,7 +14,7 @@ html|*.textbox-input {
 }
 
 html|*.textbox-textarea {
-  -moz-appearance: none !important;
+  appearance: none !important;
   text-shadow: inherit;
   box-sizing: border-box;
   -moz-box-flex: 1;

toolkit/content/widgets/datetimebox.css

@@ -6,7 +6,7 @@
 @namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 .datetime-input-box-wrapper {
-  -moz-appearance: none;
+  appearance: none;
   display: inline-flex;
   flex: 1;
   cursor: default;
@@ -22,7 +22,7 @@
 }
 
 .datetime-input {
-  -moz-appearance: none;
+  appearance: none;
   text-align: center;
   padding: 0;
   border: 0;

toolkit/content/xul.css

@@ -302,7 +302,7 @@ toolbar[type="menubar"][autohide="true"] {
 toolbar[type="menubar"][autohide="true"][inactive="true"]:not([customizing="true"]) {
   min-height: 0 !important;
   height: 0 !important;
-  -moz-appearance: none !important;
+  appearance: none !important;
   border-style: none !important;
 }
 %endif
@@ -942,7 +942,7 @@ menulist {
 
 menulist[popuponly="true"] {
   -moz-binding: url("chrome://global/content/bindings/menulist.xml#menulist-popuponly");
-  -moz-appearance: none !important;
+  appearance: none !important;
   margin: 0 !important;
   height: 0 !important;
   border: 0 !important;

toolkit/forgetaboutsite/ForgetAboutSite.jsm

@@ -120,24 +120,28 @@ this.ForgetAboutSite = {
     }));
 
     // Passwords
-    promises.push(Task.spawn(function*() {
-      let lm = Cc["@mozilla.org/login-manager;1"].
-               getService(Ci.nsILoginManager);
-      // Clear all passwords for domain
-      let logins = lm.getAllLogins();
-      for (let i = 0; i < logins.length; i++) {
-        if (hasRootDomain(logins[i].hostname, aDomain)) {
-          lm.removeLogin(logins[i]);
+    if (Services.prefs.getBoolPref("privacy.forgetaboutsite.clearPasswords", false) == true) {
+      promises.push(Task.spawn(function*() {
+        let lm = Cc["@mozilla.org/login-manager;1"].
+                 getService(Ci.nsILoginManager);
+        // Clear all passwords for domain
+        let logins = lm.getAllLogins();
+        for (let i = 0; i < logins.length; i++) {
+          if (hasRootDomain(logins[i].hostname, aDomain)) {
+            lm.removeLogin(logins[i]);
+          }
         }
-      }
-    }).catch(ex => {
-      // XXX:
-      // Is there a better way to do this rather than this hacky comparison?
-      // Copied this from toolkit/components/passwordmgr/crypto-SDR.js
-      if (!ex.message.includes("User canceled master password entry")) {
-        throw new Error("Exception occured in clearing passwords: " + ex);
-      }
-    }));
+      }).catch(ex => {
+        // XXX:
+        // Is there a better way to do this rather than this hacky comparison?
+        // Copied this from toolkit/components/passwordmgr/crypto-SDR.js
+        if (!ex.message.includes("User canceled master password entry")) {
+          throw new Error("Exception occured in clearing passwords: " + ex);
+        }
+      }));
+    } else {
+      Services.console.logStringMessage("**NOTE** Forget about site: passwords not cleared for domain " + aDomain);
+    }
 
     // Permissions
     let pm = Cc["@mozilla.org/permissionmanager;1"].

toolkit/jetpack/sdk/ui/toolbar/view.js

@@ -125,7 +125,7 @@ const addView = curry((options, {document, window}) => {
   toolbar.setAttribute("id", "inner-" + options.id);
   toolbar.setAttribute("defaultset", options.items.join(","));
   toolbar.setAttribute("customizable", "true");
-  toolbar.setAttribute("style", "-moz-appearance: none; overflow: hidden");
+  toolbar.setAttribute("style", "appearance: none; overflow: hidden");
   toolbar.setAttribute("mode", "icons");
   toolbar.setAttribute("iconsize", "small");
   toolbar.setAttribute("context", "toolbar-context-menu");

toolkit/themes/faststripe/global/button.css

@@ -11,7 +11,7 @@
 /* :::::::::: button :::::::::: */
 
 button {
-  /*-moz-appearance: button;*/
+  /*appearance: button;*/
   margin: 3px 7px 3px 7px;
   min-width: 6.3em;
   border: 1px solid;
@@ -86,7 +86,7 @@ button[type="menu-button"] {
 
 .button-menu-dropmarker,
 .button-menubutton-dropmarker {
-  -moz-appearance: none !important;
+  appearance: none !important;
   margin: 1px;
   background-color: transparent !important;
   border: none !important;

toolkit/themes/faststripe/global/groupbox.css

@@ -11,7 +11,7 @@
 /* ::::: groupbox ::::: */
 
 groupbox {
-  -moz-appearance: groupbox;
+  appearance: groupbox;
   border: 1px solid gray;
   border-radius: 3px;
   margin: 3px;
@@ -28,7 +28,7 @@ caption {
 }
 
 tabpanels caption {
-  -moz-appearance: tabpanel;
+  appearance: tabpanel;
 }
 
 /* !important is needed to override label in global.css */

toolkit/themes/faststripe/global/menu.css

@@ -12,7 +12,7 @@
 
 menu,
 menuitem {
-  -moz-appearance: menuitem;
+  appearance: menuitem;
   -moz-box-align: center;
   color: MenuText;
   font: menu;
@@ -47,7 +47,7 @@ menuitem.spell-suggestion {
 
 .menu-text {
   padding-inline-start: 1.45em !important;
-  -moz-appearance: menuitemtext;
+  appearance: menuitemtext;
 }
 
 .menu-text,
@@ -83,7 +83,7 @@ menu.menu-iconic > .menu-iconic-left,
 menuitem.menuitem-iconic > .menu-iconic-left,
 menu.menu-iconic > .menu-iconic-right,
 menuitem.menuitem-iconic > .menu-iconic-right {
-  -moz-appearance: menuimage;
+  appearance: menuimage;
   padding-top: 2px;
 }
 
@@ -146,7 +146,7 @@ menuitem[_moz-menuactive="true"] {
 
 menulist > menupopup > menuitem,
 menulist > menupopup > menu {
-  -moz-appearance: none;
+  appearance: none;
   border: 1px solid transparent;
   padding: 1px 5px;
   max-width: none;

toolkit/themes/faststripe/global/popup.css

@@ -23,7 +23,7 @@ menupopup,
 /* auto complete popups don't render well as vista menus */
 popup:not([type="autocomplete"])
 {
-  -moz-appearance: menupopup;
+  appearance: menupopup;
 }
 
 menupopup > menu > menupopup,

toolkit/themes/faststripe/global/radio.css

@@ -11,7 +11,7 @@
 /* ::::: radio ::::: */
 
 radio {
-  -moz-appearance: radio-container;
+  appearance: radio-container;
   -moz-box-align: center;
   margin: 2px 4px;
   padding-top: 1px;

toolkit/themes/faststripe/global/xulscrollbars.css

@@ -21,7 +21,7 @@ scrollbar {
 
 scrollbar[orient="vertical"] 
 {
-   -moz-appearance: scrollbar-vertical;
+   appearance: scrollbar-vertical;
   border-left: none;
   border-right: none;
   border-top: 1px solid #555555;
@@ -62,7 +62,7 @@ scrollbarbutton:hover:active, scrollbarbutton[active="true"] {
 /* ::::: square at the corner of two scrollbars ::::: */
 
 scrollcorner { 
-  /* XXX -moz-appearance: scrollcorner; */
+  /* XXX appearance: scrollcorner; */
   -moz-binding: url(chrome://global/content/bindings/scrollbar.xml#scrollbar-base);
   width: 16px;
   cursor: default;
@@ -72,7 +72,7 @@ scrollcorner {
 /* ..... increment .... */
 
 scrollbarbutton[type="increment"] {
-  -moz-appearance: scrollbarbutton-right;
+  appearance: scrollbarbutton-right;
   background-image: url("chrome://global/skin/arrow/arrow-rit.gif")
 }
 
@@ -81,7 +81,7 @@ scrollbarbutton[type="increment"][disabled="true"] {
 }
 
 scrollbar[orient="vertical"] > scrollbarbutton[type="increment"] {
-  -moz-appearance: scrollbarbutton-down;
+  appearance: scrollbarbutton-down;
   background-image: url("chrome://global/skin/arrow/arrow-dn.gif")
 }
 
@@ -92,7 +92,7 @@ scrollbar[orient="vertical"] > scrollbarbutton[type="increment"][disabled="true"
 /* ..... decrement .... */
 
 scrollbarbutton[type="decrement"] {
-  -moz-appearance: scrollbarbutton-left;
+  appearance: scrollbarbutton-left;
    background-image: url("chrome://global/skin/arrow/arrow-lft.gif")
 }
 
@@ -101,7 +101,7 @@ scrollbarbutton[type="decrement"][disabled="true"] {
 }
 
 scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"] {
-  -moz-appearance: scrollbarbutton-up;
+  appearance: scrollbarbutton-up;
    background-image: url("chrome://global/skin/arrow/arrow-up.gif")
 }
 
@@ -116,7 +116,7 @@ scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"][disabled="true"
   /* ::::: scrollbar ::::: */
 
   html|div scrollbar {
-    -moz-appearance: scrollbar-horizontal;
+    appearance: scrollbar-horizontal;
     -moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar");
     cursor: default;
     background: url("chrome://global/skin/scrollbar/slider.gif") scrollbar;
@@ -124,7 +124,7 @@ scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"][disabled="true"
 
   html|div scrollbar[orient="vertical"] 
   {
-     -moz-appearance: scrollbar-vertical;
+     appearance: scrollbar-vertical;
   }
 
   /* ::::: borders for thumb and buttons ::::: */
@@ -142,12 +142,12 @@ scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"][disabled="true"
   /* ::::: thumb (horizontal) ::::: */
 
   html|div thumb {
-    -moz-appearance: scrollbarthumb-vertical;
+    appearance: scrollbarthumb-vertical;
     min-height: 8px;
   }
 
   html|div thumb[orient="horizontal"] {
-    -moz-appearance: scrollbarthumb-horizontal;
+    appearance: scrollbarthumb-horizontal;
     min-width: 8px;
   }
 
@@ -170,7 +170,7 @@ scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"][disabled="true"
   /* ..... increment .... */
 
   html|div scrollbarbutton[type="increment"] {
-    -moz-appearance: scrollbarbutton-right;
+    appearance: scrollbarbutton-right;
     background-image: url("chrome://global/skin/arrow/arrow-rit.gif")
   }
 
@@ -179,7 +179,7 @@ scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"][disabled="true"
   }
 
   html|div scrollbar[orient="vertical"] > scrollbarbutton[type="increment"] {
-    -moz-appearance: scrollbarbutton-down;
+    appearance: scrollbarbutton-down;
     background-image: url("chrome://global/skin/arrow/arrow-dn.gif")
   }
 
@@ -190,7 +190,7 @@ scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"][disabled="true"
   /* ..... decrement .... */
 
   html|div scrollbarbutton[type="decrement"] {
-    -moz-appearance: scrollbarbutton-left;
+    appearance: scrollbarbutton-left;
      background-image: url("chrome://global/skin/arrow/arrow-lft.gif")
   }
 
@@ -199,7 +199,7 @@ scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"][disabled="true"
   }
 
   html|div scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"] {
-    -moz-appearance: scrollbarbutton-up;
+    appearance: scrollbarbutton-up;
      background-image: url("chrome://global/skin/arrow/arrow-up.gif")
   }
 

toolkit/themes/linux/global/alerts/alert.css

@@ -16,7 +16,7 @@
 }
 
 .alertCloseButton {
-  -moz-appearance: none;
+  appearance: none;
   height: 16px;
   padding: 4px 2px;
   width: 16px;

toolkit/themes/linux/global/autocomplete.css

@@ -18,7 +18,7 @@ textbox:not(.padded) {
 }
 
 textbox[enablehistory="true"] {
-  -moz-appearance: none;
+  appearance: none;
   border: 0;
   background-color: transparent;
 }
@@ -32,7 +32,7 @@ textbox[nomatch="true"][highlightnonmatches="true"] {
 }
 
 textbox[enablehistory="true"] > .autocomplete-textbox-container {
-  -moz-appearance: menulist-textfield;
+  appearance: menulist-textfield;
 }
 
 textbox:not(.padded) .textbox-input-box {
@@ -52,7 +52,7 @@ panel[type="autocomplete-richlistbox"],
   padding: 0;
   color: -moz-FieldText;
   background-color: -moz-Field;
-  -moz-appearance: none;
+  appearance: none;
 }
 
 .autocomplete-history-popup {
@@ -62,13 +62,13 @@ panel[type="autocomplete-richlistbox"],
 /* ::::: tree ::::: */
 
 .autocomplete-tree {
-  -moz-appearance: none !important;
+  appearance: none !important;
   border: none !important;
   background-color: transparent !important;
 }
 
 .autocomplete-treecol {
-  -moz-appearance: none !important;
+  appearance: none !important;
   margin: 0 !important;
   border: none !important;
   padding: 0 !important;
@@ -76,7 +76,7 @@ panel[type="autocomplete-richlistbox"],
 
 /* GTK calculates space for a sort arrow */
 .autocomplete-treecol > .treecol-sortdirection {
-  -moz-appearance: none !important;
+  appearance: none !important;
 }
 
 .autocomplete-treebody::-moz-tree-cell-text {
@@ -99,7 +99,7 @@ treechildren.autocomplete-treebody::-moz-tree-cell-text(selected) {
 /* ::::: richlistbox autocomplete ::::: */
 
 .autocomplete-richlistbox {
-  -moz-appearance: none;
+  appearance: none;
   margin: 1px;
   background-color: transparent;
 }

toolkit/themes/linux/global/button.css

@@ -11,7 +11,7 @@
 /* :::::::::: button :::::::::: */
 
 button {
-  -moz-appearance: button;
+  appearance: button;
   margin: 1px 5px 2px 5px;
   min-width: 6.3em;
   border: 3px solid;
@@ -25,7 +25,7 @@ button {
 }
 
 .button-box {
-  -moz-appearance: button-focus;
+  appearance: button-focus;
   border: 1px solid transparent;
   padding-top: 1px;
   padding-bottom: 2px;
@@ -113,7 +113,7 @@ button[disabled="true"] > .button-box {
 /* ::::: menu/menu-button buttons ::::: */
 
 button[type="menu-button"] {
-  -moz-appearance: dualbutton;
+  appearance: dualbutton;
 }
 
 .button-menubutton-button {
@@ -122,7 +122,7 @@ button[type="menu-button"] {
 
 .button-menu-dropmarker,
 .button-menubutton-dropmarker {
-  -moz-appearance: toolbarbutton-dropdown !important;
+  appearance: toolbarbutton-dropdown !important;
 }
 
 .button-menubutton-dropmarker {
@@ -141,7 +141,7 @@ button[type="disclosure"] {
   border: 0px !important;
   margin: 0px !important;
   padding: 0px !important;
-  -moz-appearance: none;
+  appearance: none;
   list-style-image: url("chrome://global/skin/tree/twisty-clsd.png");
   min-width: 0px !important;
   background-color: transparent;

toolkit/themes/linux/global/checkbox.css

@@ -11,7 +11,7 @@
 /* ::::: checkbox ::::: */
 
 checkbox {
-  -moz-appearance: checkbox-container;
+  appearance: checkbox-container;
   margin: 2px 4px;
   border-left: 2px transparent;
   border-right: 2px transparent;
@@ -27,7 +27,7 @@ checkbox {
    mark. */
 
 .checkbox-spacer-box {
-  -moz-appearance: checkbox;
+  appearance: checkbox;
   -moz-box-align: center;
   margin: 2px;
   border-right: 2px solid transparent;
@@ -38,7 +38,7 @@ checkbox {
 }
 
 .checkbox-label-box {
-  -moz-appearance: checkbox-label;
+  appearance: checkbox-label;
 }
 
 .checkbox-icon[src] {

toolkit/themes/linux/global/colorpicker.css

@@ -13,7 +13,7 @@
 /* colorpicker button */
 
 colorpicker[type="button"] {
-  -moz-appearance: button;
+  appearance: button;
   width: 38px;
   height: 24px;
 }

toolkit/themes/linux/global/dropmarker.css

@@ -3,5 +3,5 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 dropmarker {
-  -moz-appearance: menulist-button;
+  appearance: menulist-button;
 }

toolkit/themes/linux/global/findBar.css

@@ -26,13 +26,13 @@ findbar[hidden] {
 /* find-next button */
 
 .findbar-find-next > .toolbarbutton-icon {
-  -moz-appearance: button-arrow-next;
+  appearance: button-arrow-next;
 }
 
 /* find-previous button */
 
 .findbar-find-previous > .toolbarbutton-icon {
-  -moz-appearance: button-arrow-previous;
+  appearance: button-arrow-previous;
 }
 
 /* highlight button */
@@ -74,7 +74,7 @@ findbar[hidden] {
 }
 
 .findbar-textbox {
-  -moz-appearance: none;
+  appearance: none;
   border: 1px solid ThreeDShadow;
   box-shadow: 0 0 1px 0 ThreeDShadow inset;
   margin: 0;

toolkit/themes/linux/global/global.css

@@ -48,7 +48,7 @@ page,
 dialog,
 wizard,
 prefwindow {
-  -moz-appearance: window;
+  appearance: window;
   background-color: -moz-Dialog;
   color: -moz-DialogText;
   font: message-box;
@@ -98,7 +98,7 @@ iframe {
 /* ::::: statusbar ::::: */
 
 statusbar {
-  -moz-appearance: statusbar;
+  appearance: statusbar;
   border-top: 1px solid ThreeDLightShadow;
   border-left: 1px solid ThreeDShadow;
   border-right: 1px solid ThreeDHighlight;
@@ -108,7 +108,7 @@ statusbar {
 }
 
 statusbarpanel {
-  -moz-appearance: statusbarpanel;
+  appearance: statusbarpanel;
   -moz-box-align: center;
   -moz-box-pack: center;
   border-left: 1px solid ThreeDHighlight;
@@ -121,7 +121,7 @@ statusbarpanel {
 .statusbar-resizerpanel {
   -moz-box-align: end;
   -moz-box-pack: end;
-  -moz-appearance: resizerpanel;
+  appearance: resizerpanel;
   padding: 0;
   border: none;
 }
@@ -157,7 +157,7 @@ toolbar[mode="text"] .toolbarbutton-text {
 :root:-moz-lwtheme,
 [lwthemefooter="true"],
 statusbarpanel:-moz-lwtheme {
-  -moz-appearance: none;
+  appearance: none;
 }
 
 sidebarheader:-moz-lwtheme {
@@ -219,7 +219,7 @@ separator.groove[orient="vertical"] {
 }
     
 .plain {
-  -moz-appearance: none;
+  appearance: none;
   margin: 0 !important;
   border: none;
   padding: 0;
@@ -306,7 +306,7 @@ popupnotificationcontent {
   background-image: url("chrome://global/skin/icons/autoscroll.png");
   background-color: transparent;
   background-position: right top;
-  -moz-appearance: none;
+  appearance: none;
 }
 
 .autoscroller[scrolldir="NS"] {
@@ -321,7 +321,7 @@ popupnotificationcontent {
 
 %ifdef MOZ_AUSTRALIS
 .close-icon {
-  -moz-appearance: none;
+  appearance: none;
   height: 16px;
   width: 16px;
   background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 16, 16, 0);

toolkit/themes/linux/global/in-content/common.css

@@ -21,11 +21,11 @@ xul|menulist {
 
 xul|button > xul|*.button-box,
 xul|menulist > xul|*.menulist-label-box {
-  -moz-appearance: none;
+  appearance: none;
 }
 
 xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker {
-  -moz-appearance: none !important;
+  appearance: none !important;
 }
 
 xul|*.help-button > xul|*.button-box > xul|*.button-icon {
@@ -75,7 +75,7 @@ xul|*.radio-check[selected] {
 }
 
 xul|*.radio-label-box {
-  -moz-appearance: none;
+  appearance: none;
 }
 
 /* Override OS-theme-based color to make it visible
@@ -86,7 +86,7 @@ xul|checkbox:not([disabled="true"]):hover {
 }
 
 xul|*.numberbox-input-box {
-  -moz-appearance: none;
+  appearance: none;
   border-width: 0;
 }
 
@@ -102,7 +102,7 @@ xul|checkbox:-moz-focusring > xul|*.checkbox-label-box {
 }
 
 xul|spinbuttons {
-  -moz-appearance: none;
+  appearance: none;
 }
 
 xul|treechildren::-moz-tree-row(multicol, odd) {

toolkit/themes/linux/global/inContentUI.css

@@ -11,7 +11,7 @@
 
 /* Page background */
 *|*:root {
-  -moz-appearance: none;
+  appearance: none;
   padding: 18px;
   background-color: Window;
   background-image: /* Texture */

toolkit/themes/linux/global/listbox.css

@@ -11,7 +11,7 @@
 /* ::::: listbox ::::: */
 
 listbox {
-  -moz-appearance: listbox;
+  appearance: listbox;
   margin: 2px 4px;
   border: 2px solid;
   -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
@@ -54,7 +54,7 @@ listbox:focus > listitem[selected="true"] {
 /* ::::: listheader ::::: */
 
 listheader { 
-  -moz-appearance: treeheadercell;
+  appearance: treeheadercell;
   -moz-box-align: center;
   border: 2px solid;
   -moz-border-top-colors: ThreeDHighlight ThreeDLightShadow;
@@ -98,7 +98,7 @@ listheader[sortable="true"]:hover:active {
 /* ..... sort direction icon ..... */
 
 .listheader-sortdirection {
-  -moz-appearance: treeheadersortarrow;
+  appearance: treeheadersortarrow;
 }
 
 /* ::::: listcell ::::: */
@@ -123,7 +123,7 @@ listheader[sortable="true"]:hover:active {
 /* ::::: listcell checkbox ::::: */
 
 .listcell-check {
-  -moz-appearance: checkbox;
+  appearance: checkbox;
   -moz-box-align: center;
   margin: 0px 2px;
   border: 1px solid -moz-DialogText;

toolkit/themes/linux/global/menu.css

@@ -14,7 +14,7 @@ menu,
 menuitem,
 menucaption,
 .splitmenu-menuitem {
-  -moz-appearance: menuitem;
+  appearance: menuitem;
   -moz-box-align: center;
   max-width: 42em;
   color: MenuText;
@@ -142,7 +142,7 @@ menucaption > .menu-iconic-text {
   /* These next two rules are needed to prevent inheritance and thus ugliness */
   list-style-image: none;
   -moz-image-region: auto;
-  -moz-appearance: menuarrow;
+  appearance: menuarrow;
 }
 
 .menubar-left {
@@ -168,23 +168,23 @@ menulist > menupopup > menu > .menu-iconic-left {
 /* ::::: checkbox menuitem ::::: */
 
 menuitem[checked="true"] {
-  -moz-appearance: checkmenuitem !important;
+  appearance: checkmenuitem !important;
 }
 
 menuitem[type="checkbox"] {
-  -moz-appearance: checkmenuitem !important;
+  appearance: checkmenuitem !important;
 }
 
 /* ::::: radio menuitem ::::: */
 
 menuitem[type="radio"] {
-  -moz-appearance: radiomenuitem !important;
+  appearance: radiomenuitem !important;
 }
 
 /* ::::: menuseparator ::::: */
 
 menuseparator {
-  -moz-appearance: menuseparator;
+  appearance: menuseparator;
 }
 
 /* ::::: autocomplete ::::: */

toolkit/themes/linux/global/menulist.css

@@ -12,7 +12,7 @@
 /* :::::::::: menulist :::::::::: */
 
 menulist {
-  -moz-appearance: menulist;
+  appearance: menulist;
   margin: 2px 4px;
   color: -moz-DialogText;
   font: menu;
@@ -20,7 +20,7 @@ menulist {
 }
 
 .menulist-label-box {
-  -moz-appearance: menulist-text;
+  appearance: menulist-text;
   -moz-box-align: center;
   -moz-box-pack: center;
   color: inherit;
@@ -58,12 +58,12 @@ menulist[disabled="true"]:hover:active {
 /* ::::: editable menulists ::::: */
 
 menulist[editable="true"] {
-  -moz-appearance: none;
+  appearance: none;
   color: -moz-FieldText;
 }
 
 .menulist-editable-box {
-  -moz-appearance: menulist-textfield;
+  appearance: menulist-textfield;
   padding-top: 3px;
   padding-bottom: 3px;
   padding-inline-start: 2px;
@@ -72,7 +72,7 @@ menulist[editable="true"] {
 
 menulist[editable="true"] > .menulist-dropmarker {
   display: -moz-box;
-  -moz-appearance: menulist-button;
+  appearance: menulist-button;
 %if MOZ_WIDGET_GTK == 3
   min-width: 2.5em;
   min-height: 2.25em;

toolkit/themes/linux/global/notification.css

@@ -6,7 +6,7 @@
 
 notification {
   color: -moz-gtk-info-bar-text;
-  -moz-appearance: -moz-gtk-info-bar;
+  appearance: -moz-gtk-info-bar;
 %if MOZ_WIDGET_GTK == 2
   background-color: InfoBackground;
 %endif
@@ -16,7 +16,7 @@ notification {
 notification[type="info"] {
   color: -moz-DialogText;
   background-color: -moz-Dialog;
-  -moz-appearance: none;
+  appearance: none;
   border-top: 1px solid ThreeDShadow;
   border-bottom: 1px solid ThreeDShadow;
 }
@@ -32,7 +32,7 @@ notificationbox[notificationside="bottom"] > notification[type="info"] {
 notification[type="critical"] {
   color: white;
   background-image: linear-gradient(rgb(212,0,0), rgb(152,0,0));
-  -moz-appearance: none;
+  appearance: none;
 }
 
 .notification-inner {

toolkit/themes/linux/global/numberbox.css

@@ -10,7 +10,7 @@
 @namespace html url("http://www.w3.org/1999/xhtml");
 
 textbox[type="number"] {
-  -moz-appearance: none;
+  appearance: none;
   padding: 0 !important;
   border: none;
   cursor: default;
@@ -23,7 +23,7 @@ html|*.numberbox-input {
 
 .numberbox-input-box {
   -moz-box-align: center;
-  -moz-appearance: spinner-textfield;
+  appearance: spinner-textfield;
   margin-right: -1px;
   border: 2px solid;
   -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
@@ -34,5 +34,5 @@ html|*.numberbox-input {
 }
 
 textbox[hidespinbuttons="true"] > .numberbox-input-box {
-  -moz-appearance: textfield;
+  appearance: textfield;
 }

toolkit/themes/linux/global/popup.css

@@ -8,7 +8,7 @@
 
 menupopup,
 panel {
-  -moz-appearance: menupopup;
+  appearance: menupopup;
   min-width: 1px;
   color: MenuText;
 }
@@ -16,7 +16,7 @@ panel {
 /* ::::: arrow panel ::::: */
 
 panel[type="arrow"] {
-  -moz-appearance: none;
+  appearance: none;
 }
 
 panel[type="arrow"][side="top"],
@@ -78,7 +78,7 @@ panel[type="arrow"][side="right"] {
 /* ::::: tooltip ::::: */
 
 tooltip {
-  -moz-appearance: tooltip;
+  appearance: tooltip;
   margin-top: 21px;
   max-width: 40em;
   color: InfoText;

toolkit/themes/linux/global/preferences.css

@@ -37,7 +37,7 @@ prefwindow[type="child"] .prefWindow-dlgbuttons {
 }
 
 radio[pane] {
-  -moz-appearance: none;
+  appearance: none;
   min-width: 4.5em;
   margin: 0;
   padding: 3px;
@@ -45,7 +45,7 @@ radio[pane] {
 }
 
 .paneSelector {
-  -moz-appearance: listbox;
+  appearance: listbox;
   margin: 8px 8px 0 8px;
   padding: 0;
 }

toolkit/themes/linux/global/radio.css

@@ -11,7 +11,7 @@
 /* ::::: radio ::::: */
 
 radio {
-  -moz-appearance: radio-container;
+  appearance: radio-container;
   margin: 2px 4px;
   border-left: 2px transparent;
   border-right: 2px transparent;
@@ -27,7 +27,7 @@ radio {
    mark. */
 
 .radio-spacer-box {
-  -moz-appearance: radio;
+  appearance: radio;
   -moz-box-align: center;
   margin: 2px;
   border-right: 2px solid transparent;
@@ -38,7 +38,7 @@ radio {
 }
 
 .radio-label-box {
-  -moz-appearance: radio-label;
+  appearance: radio-label;
 }
 
 .radio-icon[src] {

toolkit/themes/linux/global/scrollbox.css

@@ -6,22 +6,22 @@
 
 .autorepeatbutton-up > .autorepeatbutton-icon,
 .scrollbutton-up > .toolbarbutton-icon {
-  -moz-appearance: button-arrow-up;
+  appearance: button-arrow-up;
 }
 
 .autorepeatbutton-down > .autorepeatbutton-icon,
 .scrollbutton-down > .toolbarbutton-icon {
-  -moz-appearance: button-arrow-down;
+  appearance: button-arrow-down;
 }
 
 .autorepeatbutton-up[orient="horizontal"] > .autorepeatbutton-icon,
 .scrollbutton-up[orient="horizontal"] > .toolbarbutton-icon {
-  -moz-appearance: button-arrow-previous;
+  appearance: button-arrow-previous;
 }
 
 .autorepeatbutton-down[orient="horizontal"] > .autorepeatbutton-icon,
 .scrollbutton-down[orient="horizontal"] > .toolbarbutton-icon {
-  -moz-appearance: button-arrow-next;
+  appearance: button-arrow-next;
 }
 
 :-moz-any(.scrollbutton-up, .scrollbutton-down) > .toolbarbutton-text {

toolkit/themes/linux/global/splitter.css

@@ -11,7 +11,7 @@
 /* ::::: splitter (vertical) ::::: */
 
 splitter {
-  -moz-appearance: splitter;
+  appearance: splitter;
   -moz-box-align: center;
   -moz-box-pack: center;
   cursor: ew-resize;

toolkit/themes/linux/global/tabbox.css

@@ -19,7 +19,7 @@ tabs {
 /* ::::: tabpanels ::::: */
 
 tabpanels {
-  -moz-appearance: tabpanels;
+  appearance: tabpanels;
   border: 2px solid;
   -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
   -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
@@ -34,7 +34,7 @@ tabpanels {
 
 tab {
   position: relative;
-  -moz-appearance: tab;
+  appearance: tab;
   margin-top: 2px;
   border: 2px solid;
   border-bottom: none;

toolkit/themes/linux/global/textbox.css

@@ -12,7 +12,7 @@
 /* ::::: textbox ::::: */
 
 textbox {
-  -moz-appearance: textfield;
+  appearance: textfield;
   cursor: text;
   margin: 2px 4px;
   border: 2px solid;
@@ -58,7 +58,7 @@ textbox[disabled="true"] {
 /* ::::: plain textbox ::::: */
 
 textbox.plain {
-  -moz-appearance: none !important;
+  appearance: none !important;
   background-color: transparent;
   padding: 0px !important;
   margin: 0px !important;

toolkit/themes/linux/global/toolbar.css

@@ -11,20 +11,20 @@
 /* ::::: toolbox ::::: */
 
 toolbox {
-  -moz-appearance: toolbox;
+  appearance: toolbox;
 }
 
 /* ::::: menubar & toolbar ::::: */
 
 toolbar {
-  -moz-appearance: toolbar;
+  appearance: toolbar;
   min-width: 1px;
   min-height: 20px;
   padding: 2px 0px;
 }
 
 menubar, toolbar[type="menubar"] {
-  -moz-appearance: menubar;
+  appearance: menubar;
   color: -moz-menubartext;
   min-width: 1px;
   min-height: 20px;
@@ -35,13 +35,13 @@ menubar, toolbar[type="menubar"] {
 %ifdef MOZ_AUSTRALIS
 menubar:-moz-lwtheme,
 toolbar:-moz-lwtheme {
-  -moz-appearance: none;
+  appearance: none;
   color: inherit;
 }
 %else
 menubar:-moz-lwtheme,
 toolbar:-moz-lwtheme {
-  -moz-appearance: none;
+  appearance: none;
   color: inherit;
   border-style: none;
 }
@@ -49,13 +49,13 @@ toolbar:-moz-lwtheme {
 
 /* in browser.xul, the menubar is inside a toolbar... */
 toolbaritem > menubar {
-  -moz-appearance: none;
+  appearance: none;
 }
 
 /* ::::: toolbar decorations ::::: */
 
 toolbarseparator {
-  -moz-appearance: separator;
+  appearance: separator;
   margin : 0;
   border: 0;
   min-width: 2px;

toolkit/themes/linux/global/toolbarbutton.css

@@ -11,7 +11,7 @@
 /* ::::: toolbarbutton ::::: */
 
 toolbarbutton {
-  -moz-appearance: toolbarbutton;
+  appearance: toolbarbutton;
   -moz-box-align: center;
   -moz-box-pack: center;
   margin: 0;
@@ -70,7 +70,7 @@ toolbarbutton:-moz-lwtheme:not(:hover):not([checked="true"]):not([open="true"]):
 /* ::::: toolbarbutton menu ::::: */
 
 .toolbarbutton-menu-dropmarker {
-  -moz-appearance: toolbarbutton-dropdown !important;
+  appearance: toolbarbutton-dropdown !important;
   list-style-image: none;
   -moz-image-region: auto;
   padding: 0;
@@ -85,7 +85,7 @@ toolbarbutton:-moz-lwtheme:not(:hover):not([checked="true"]):not([open="true"]):
 
 toolbarbutton[type="menu-button"] {
   -moz-box-align: stretch;
-  -moz-appearance: dualbutton;
+  appearance: dualbutton;
   -moz-box-orient: horizontal !important;
 }
 
@@ -132,7 +132,7 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
 
 .toolbarbutton-menubutton-dropmarker {
   margin: 0 3px;
-  -moz-appearance: toolbarbutton-dropdown !important;
+  appearance: toolbarbutton-dropdown !important;
   list-style-image: none;
   -moz-image-region: auto;
 }

toolkit/themes/linux/global/tree.css

@@ -19,7 +19,7 @@ tree {
   -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
   background-color: -moz-Field;
   color: -moz-FieldText;
-  -moz-appearance: listbox;
+  appearance: listbox;
 }
 
 /* ::::: tree focusring ::::: */
@@ -201,7 +201,7 @@ treechildren::-moz-tree-cell-text(progressmeter) {
 
 treecol,
 treecolpicker {
-  -moz-appearance: treeheadercell;
+  appearance: treeheadercell;
   -moz-box-align: center;
   -moz-box-pack: center;
   border: 2px solid;
@@ -228,7 +228,7 @@ treecolpicker:hover {
 }
 
 treecol[hideheader="true"] {
-  -moz-appearance: none;
+  appearance: none;
   border: none;
   padding: 0;
 }
@@ -290,7 +290,7 @@ treechildren::-moz-tree-column(insertafter) {
 /* ::::: sort direction indicator :::::  */
 
 .treecol-sortdirection {
-  -moz-appearance: treeheadersortarrow;
+  appearance: treeheadersortarrow;
 }
 
 /* ::::: column picker :::::  */
@@ -302,7 +302,7 @@ treechildren::-moz-tree-column(insertafter) {
 /* ::::: twisty :::::  */
 
 treechildren::-moz-tree-twisty {
-  -moz-appearance: treetwisty;
+  appearance: treetwisty;
   padding-inline-end: 4px;
   padding-top: 1px;
   width: 9px; /* The image's width is 9 pixels */
@@ -310,7 +310,7 @@ treechildren::-moz-tree-twisty {
 }
 
 treechildren::-moz-tree-twisty(open) {
-  -moz-appearance: treetwistyopen;
+  appearance: treetwistyopen;
   width: 9px; /* The image's width is 9 pixels */
   list-style-image: url("chrome://global/skin/tree/twisty-open.png");
 }
@@ -353,7 +353,7 @@ treechildren::-moz-tree-cell-text(active, selected, editing) {
 }
 
 .tree-input {
-  -moz-appearance: none;
+  appearance: none;
   border: 1px solid Highlight;
   -moz-border-top-colors: Highlight;
   -moz-border-bottom-colors: Highlight;

toolkit/themes/linux/mozapps/downloads/downloads.css

@@ -8,7 +8,7 @@
 
 /* Download View */
 #downloadView {
-  -moz-appearance: none !important;
+  appearance: none !important;
   margin: 0;
   border-bottom: 2px solid;
   -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
@@ -33,7 +33,7 @@ richlistitem[type="download"] .dateTime {
 }
 
 .mini-button {
-  -moz-appearance: none;
+  appearance: none;
   background-color: transparent;
   border: none;
   padding: 0;

toolkit/themes/linux/mozapps/extensions/extensions.css

@@ -116,7 +116,7 @@
 /*** category selector ***/
 
 #categories {
-  -moz-appearance: none;
+  appearance: none;
   border: none;
   -moz-margin-end: -1px;
   background-color: transparent;
@@ -125,7 +125,7 @@
 }
 
 .category {
-  -moz-appearance: none;
+  appearance: none;
   border-width: 1px;
   -moz-border-end-width: 0;
   border-style: solid;
@@ -310,7 +310,7 @@
 /*** sorters ***/
 
 .sort-controls {
-  -moz-appearance: none;
+  appearance: none;
 }
 
 .sorter[checkState="1"] .button-icon {
@@ -361,7 +361,7 @@
 /*** list ***/
 
 .list {
-  -moz-appearance: none;
+  appearance: none;
   margin: 0;
   border: none;
   background-color: transparent;
@@ -555,7 +555,7 @@
 }
 
 .addon .relnotes-toggle {
-  -moz-appearance: none;
+  appearance: none;
   border: none;
   background: transparent;
   font-weight: bold;
@@ -821,7 +821,7 @@ setting[type="radio"] > radiogroup {
 }
 
 .download-progress .cancel {
-  -moz-appearance: none;
+  appearance: none;
   background-color: ButtonFace;
   padding-bottom: 1px;
   -moz-padding-start: 2px;
@@ -903,7 +903,7 @@ setting[type="radio"] > radiogroup {
 }
 
 .button-link {
-  -moz-appearance: none;
+  appearance: none;
   background: transparent;
   border: none;
   text-decoration: underline;

toolkit/themes/linux/mozapps/extensions/selectAddons.css

@@ -69,7 +69,7 @@
 }
 
 #select-header .select-cell {
-  -moz-appearance: treeheadercell;
+  appearance: treeheadercell;
   box-sizing: border-box;
 }
 

toolkit/themes/linux/mozapps/update/updates.css

@@ -61,7 +61,7 @@ wizardpage {
 
 #pauseButton {
   list-style-image: url("moz-icon://stock/gtk-media-pause?size=menu");
-  -moz-appearance: none;
+  appearance: none;
   background-color: transparent;
   border: none;
   min-width: 0;
@@ -120,7 +120,7 @@ update {
 }
 
 #historyItems {
-  -moz-appearance: listbox;
+  appearance: listbox;
   height: 200px;
   margin: 1px 5px 4px 5px;
 }

toolkit/themes/osx/global/alerts/alert.css

@@ -11,7 +11,7 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #alertNotification {
-  -moz-appearance: none;
+  appearance: none;
   background: transparent;
 }
 
@@ -23,7 +23,7 @@
 }
 
 .alertCloseButton {
-  -moz-appearance: none;
+  appearance: none;
   padding: 0;
   margin: 2px;
   border: none;

toolkit/themes/osx/global/autocomplete.css

@@ -26,7 +26,7 @@ textbox:not(.padded) .textbox-input-box {
 /* ::::: history button ::::: */
 
 .autocomplete-history-dropmarker {
-  -moz-appearance: none !important;
+  appearance: none !important;
   border: none !important;
   background-color: transparent !important;
   padding: 0px;
@@ -43,7 +43,7 @@ panel[type="autocomplete-richlistbox"],
   color: -moz-FieldText;
   background-color: -moz-Field;
   font: icon;
-  -moz-appearance: none;
+  appearance: none;
 }
 
 .autocomplete-history-popup {
@@ -53,13 +53,13 @@ panel[type="autocomplete-richlistbox"],
 /* ::::: tree ::::: */
 
 .autocomplete-tree {
-  -moz-appearance: none !important;
+  appearance: none !important;
   border: none !important;
   background-color: transparent !important;
 }
 
 .autocomplete-treecol {
-  -moz-appearance: none !important;
+  appearance: none !important;
   margin: 0 !important;
   border: none !important;
   padding: 0 !important;
@@ -89,7 +89,7 @@ treechildren.autocomplete-treebody::-moz-tree-cell-text(selected) {
 /* ::::: richlistbox autocomplete ::::: */
 
 .autocomplete-richlistbox {
-  -moz-appearance: none;
+  appearance: none;
   margin: 0;
 }
 

toolkit/themes/osx/global/button.css

@@ -5,7 +5,7 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 button {
-  -moz-appearance: button;
+  appearance: button;
   /* The horizontal margin used here come from the Aqua Human Interface
      Guidelines, there should be 12 pixels between two buttons. */
   margin: 5px 6px 3px;
@@ -60,7 +60,7 @@ button[type="menu-button"] {
 
 .button-menu-dropmarker,
 .button-menubutton-dropmarker {
-  -moz-appearance: none !important;
+  appearance: none !important;
   border: none;
   background-color: transparent !important;
   margin: 1px;
@@ -80,6 +80,6 @@ button.plain {
 /* ::::: help button ::::: */
 
 button[dlgtype="help"] {
-  -moz-appearance: -moz-mac-help-button;
+  appearance: -moz-mac-help-button;
   width: 20px;
 }

toolkit/themes/osx/global/checkbox.css

@@ -5,7 +5,7 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 checkbox {
-  -moz-appearance: checkbox-container;
+  appearance: checkbox-container;
   -moz-box-align: center;
   margin: 4px 2px;
 }
@@ -27,7 +27,7 @@ checkbox[disabled="true"] {
 /* ::::: checkmark image ::::: */
 
 .checkbox-check {
-  -moz-appearance: checkbox;
+  appearance: checkbox;
   margin: 1px 1px 0;
   /* vertical-align tells native theming where to snap to. However, this doesn't
    * always work reliably because of bug 503833. */

toolkit/themes/osx/global/colorpicker.css

@@ -12,7 +12,7 @@ colorpicker[type="button"] {
   border: 1px solid #a7a7a7;
   background-color: ThreeDFace;
   padding: 3px;
-  -moz-appearance: button-bevel;
+  appearance: button-bevel;
 }
 
 .colorpicker-button-colorbox {

toolkit/themes/osx/global/console/console.css

@@ -108,7 +108,7 @@
 /* ::::: toolbars ::::: */
 
 #ToolbarEval {
-  -moz-appearance: none;
+  appearance: none;
   background: @scopeBarBackground@;
   border-bottom: @scopeBarSeparatorBorder@;
   padding: 2px;
@@ -126,7 +126,7 @@
 #ButtonEval {
   margin: 0 4px;
   padding: 1px 10px;
-  -moz-appearance: none;
+  appearance: none;
   border-radius: 10000px;
   border: @roundButtonBorder@;
   background: @roundButtonBackground@;
@@ -157,7 +157,7 @@ toolbarseparator {
 #Console\:clear {
   -moz-box-orient: vertical;
   -moz-box-align: center;
-  -moz-appearance: toolbarbutton;
+  appearance: toolbarbutton;
   font: menu;
   text-shadow: @loweredShadow@;
   margin: 4px 0 9px;

toolkit/themes/osx/global/customizeToolbar.css

@@ -4,7 +4,7 @@
 
 #palette-box {
   margin-top: 2px;
-  -moz-appearance: listbox;
+  appearance: listbox;
   margin: 0 0 10px;
 }
 
@@ -18,7 +18,7 @@
 }
 
 #main-box > separator {
-  -moz-appearance: none;
+  appearance: none;
   border-bottom: none;
 } 
 

toolkit/themes/osx/global/datetimepicker.css

@@ -12,7 +12,7 @@ datepicker, timepicker {
 }
 
 .datetimepicker-input-box {
-  -moz-appearance: textfield;
+  appearance: textfield;
   cursor: text;
   margin-right: 4px;
   margin-bottom: 2px;
@@ -96,7 +96,7 @@ timepicker[disabled="true"] {
 }
 
 .datepicker-button {
-  -moz-appearance: none;
+  appearance: none;
   min-width: 8px;
   padding: 0px;
 }

toolkit/themes/osx/global/dialog.css

@@ -13,7 +13,7 @@
 }
 
 dialog { 
-  -moz-appearance: dialog;
+  appearance: dialog;
   padding: 14px;
 }
 

toolkit/themes/osx/global/dropmarker.css

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 dropmarker {
-  -moz-appearance: menulist-button;
+  appearance: menulist-button;
   width: 16px;
   -moz-box-align: center;
   -moz-box-pack: center;

toolkit/themes/osx/global/filefield.css

@@ -17,7 +17,7 @@
 filefield {
   margin: 4px;
   margin-inline-start: 27px;
-  -moz-appearance: textfield;
+  appearance: textfield;
 }
 
 .fileFieldContentBox {
@@ -31,7 +31,7 @@ filefield {
 }
 
 .fileFieldLabel {
-  -moz-appearance: none;
+  appearance: none;
   background-color: transparent;
   border: none;
   margin: 0 4px;

toolkit/themes/osx/global/findBar.css

@@ -25,7 +25,7 @@ findbar[hidden] {
 }
 
 findbar:-moz-lwtheme {
-  -moz-appearance: none;
+  appearance: none;
   background: none;
   border-style: none;
 }
@@ -68,7 +68,7 @@ label.findbar-find-fast:-moz-lwtheme,
 .findbar-highlight {
   margin: 0 4px;
   padding: 1px 3px;
-  -moz-appearance: none;
+  appearance: none;
   border-radius: 10000px;
   border: @roundButtonBorder@;
   background: @roundButtonBackground@;
@@ -112,7 +112,7 @@ label.findbar-find-fast:-moz-lwtheme,
 .findbar-container > checkbox {
   list-style-image: url("chrome://global/skin/icons/checkbox.png");
   -moz-image-region: rect(0px 16px 16px 0px);
-  -moz-appearance: none;
+  appearance: none;
   margin: 0 2px;
   -moz-margin-start: 7px;
 }
@@ -174,7 +174,7 @@ label.findbar-find-fast:-moz-lwtheme,
 /* Search field */
 
 .findbar-textbox {
-  -moz-appearance: none;
+  appearance: none;
   border-radius: 10000px;
   border: none;
   box-shadow: 0 1px 1.5px rgba(0, 0, 0, .7) inset,

toolkit/themes/osx/global/global.css

@@ -30,7 +30,7 @@ page,
 dialog,
 wizard,
 prefwindow { 
-  -moz-appearance: dialog;
+  appearance: dialog;
   background-color: #FFFFFF;
   color: -moz-DialogText;
   font: message-box;
@@ -99,7 +99,7 @@ statusbar {
   margin: 0px !important;
   /* need to use padding-inline-end when/if bug 631729 gets fixed: */
   padding: 0px 16px 1px 1px;
-  -moz-appearance: statusbar;
+  appearance: statusbar;
   text-shadow: rgba(255, 255, 255, 0.4) 0 1px;
 }
 
@@ -117,7 +117,7 @@ statusbarpanel {
 
 :root:-moz-lwtheme,
 [lwthemefooter="true"] {
-  -moz-appearance: none;
+  appearance: none;
 }
 
 :root:-moz-lwtheme-darktext {
@@ -129,7 +129,7 @@ statusbarpanel {
 }
 
 statusbar:-moz-lwtheme {
-  -moz-appearance: none;
+  appearance: none;
   background: none;
   border-style: none;
   text-shadow: inherit;
@@ -176,7 +176,7 @@ separator.groove[orient="vertical"] {
 }
     
 .plain {
-  -moz-appearance: none;
+  appearance: none;
   margin: 0 !important;
   border: none;
   padding: 0;
@@ -249,7 +249,7 @@ notification > button {
   padding: 1px 10px;
   min-width: 60px;
   min-height: 16px;
-  -moz-appearance: none;
+  appearance: none;
   border-radius: 10000px;
   border: @roundButtonBorder@;
   text-shadow: @loweredShadow@;
@@ -289,7 +289,7 @@ popupnotificationcontent {
   background-image: url("chrome://global/skin/icons/autoscroll.png");
   background-color: transparent;
   background-position: right top;
-  -moz-appearance: none;
+  appearance: none;
   -moz-window-shadow: none;
 }
 
@@ -316,7 +316,7 @@ popupnotificationcontent {
    * clears everything under it.
    * Without help from native theming this effect wouldn't be achievable.
    */
-  -moz-appearance: menuitem;
+  appearance: menuitem;
 }
 
 .popup-internal-box > .autorepeatbutton-up {
@@ -325,7 +325,7 @@ popupnotificationcontent {
 }
 
 .popup-internal-box > .autorepeatbutton-up > .autorepeatbutton-icon {
-  -moz-appearance: button-arrow-up;
+  appearance: button-arrow-up;
 }
 
 .popup-internal-box > .autorepeatbutton-down {
@@ -334,7 +334,7 @@ popupnotificationcontent {
 }
 
 .popup-internal-box > .autorepeatbutton-down > .autorepeatbutton-icon {
-  -moz-appearance: button-arrow-down;
+  appearance: button-arrow-down;
 }
 
 .popup-internal-box > autorepeatbutton[disabled="true"] {

toolkit/themes/osx/global/groupbox.css

@@ -11,7 +11,7 @@ groupbox {
 }
 
 .groupbox-body {
-  -moz-appearance: groupbox;
+  appearance: groupbox;
   padding: 8px 8px 3px;
   margin: 0;
 }

toolkit/themes/osx/global/in-content/common.css

@@ -67,7 +67,7 @@ xul|*.radio-icon {
 }
 
 xul|*.numberbox-input-box {
-  -moz-appearance: none;
+  appearance: none;
   border-width: 0;
 }
 
@@ -98,7 +98,7 @@ xul|radio[focused="true"] > .radio-check {
 }
 
 xul|spinbuttons {
-  -moz-appearance: none;
+  appearance: none;
 }
 
 xul|*.spinbuttons-up {

toolkit/themes/osx/global/inContentUI.css

@@ -13,7 +13,7 @@
 
 /* Page background */
 *|*:root {
-  -moz-appearance: none;
+  appearance: none;
   padding: 18px;
   background-image: /* Texture */
                     url("chrome://global/skin/inContentUI/background-texture.png"),
@@ -45,7 +45,7 @@ html|html {
 *|button,
 menulist,
 colorpicker[type="button"] {
-  -moz-appearance: none;
+  appearance: none;
   padding: 1px 4px;
   min-width: 60px;
   border-radius: 3px;
@@ -99,7 +99,7 @@ menulist > .menulist-label-box > .menulist-label {
 }
 
 menulist > .menulist-dropmarker {
-  -moz-appearance: none;
+  appearance: none;
   display: -moz-box;
   background: transparent;
   border: none;
@@ -115,7 +115,7 @@ colorpicker[type="button"] {
 }
 
 spinbuttons {
-  -moz-appearance: none;
+  appearance: none;
 }
 
 spinbuttons > .spinbuttons-box > .spinbuttons-button {

toolkit/themes/osx/global/listbox.css

@@ -5,7 +5,7 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 listbox {
-  -moz-appearance: listbox;
+  appearance: listbox;
   margin: 2px 4px;
   background-color: #FFFFFF;
   color: -moz-FieldText;
@@ -37,7 +37,7 @@ listbox:focus > listitem[selected="true"] {
 /* ::::: listheader ::::: */
 
 listheader { 
-  -moz-appearance: treeheadercell;
+  appearance: treeheadercell;
   -moz-box-align: center;
   border: 2px solid;
   -moz-border-top-colors: ThreeDHighlight ThreeDLightShadow;
@@ -91,7 +91,7 @@ listheader[sortable="true"]:hover:active {
 /* ::::: listcell checkbox ::::: */
 
 .listcell-check {
-  -moz-appearance: checkbox;
+  appearance: checkbox;
   -moz-box-align: center;
   margin: 0px 2px;
   border: 1px solid -moz-DialogText;