7 files changed, 4 insertions, 154 deletions
diff --git a/toolkit/themes/osx/global/in-content/common.css b/toolkit/themes/osx/global/in-content/common.css
index 0c6c6a99bd..3046da5cb0 100644
--- a/toolkit/themes/osx/global/in-content/common.css
+++ b/toolkit/themes/osx/global/in-content/common.css
@@ -12,6 +12,10 @@ xul|tabs {
   position: static;
 }
 
+xul|menulist > xul|menupopup:not([position]) {
+  margin-inline-start: 0;
+}
+
 xul|menupopup > xul|menuitem::after,
 xul|menupopup > xul|menuitem::before {
   content: none;
diff --git a/toolkit/themes/osx/reftests/482681-ref.xhtml b/toolkit/themes/osx/reftests/482681-ref.xhtml
deleted file mode 100644
index 62fb4bb8d5..0000000000
--- a/toolkit/themes/osx/reftests/482681-ref.xhtml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="data:text/css,
-vbox { height: 50px; }
-box {
-  -moz-appearance: button;
-}
-" type="text/css"?>
-
-<window title="Reference for mini, small and regular button sizes"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <vbox>
-    <hbox><box width="79" height="16"/></hbox>
-  </vbox>
-  <vbox>
-    <hbox><box width="79" height="19"/></hbox>
-  </vbox>
-  <vbox>
-    <hbox><box width="79" height="22"/></hbox>
-  </vbox>
-</window>
diff --git a/toolkit/themes/osx/reftests/checkboxsize-ref.xhtml b/toolkit/themes/osx/reftests/checkboxsize-ref.xhtml
deleted file mode 100644
index 30ed9dfe90..0000000000
--- a/toolkit/themes/osx/reftests/checkboxsize-ref.xhtml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-
-<window title="Reference for mini, small and regular checkbox sizes"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml">
-    vbox { height: 50px; }
-    box {
-      appearance: auto;
-      -moz-default-appearance: checkbox;
-      margin-left: 2px;
-      margin-top: 1px;
-    }
-  </style>
-  <vbox>
-    <hbox><box style="width: 11px; height: 11px"/></hbox>
-  </vbox>
-  <vbox>
-    <hbox><box style="width: 13px; height: 13px"/></hbox>
-  </vbox>
-  <vbox>
-    <hbox><box style="width: 16px; height: 16px"/></hbox>
-  </vbox>
-  <vbox>
-    <hbox checked="true"><box style="width: 11px; height: 11px"/></hbox>
-  </vbox>
-  <vbox>
-    <hbox checked="true"><box style="width: 13px; height: 13px"/></hbox>
-  </vbox>
-  <vbox>
-    <hbox checked="true"><box style="width: 16px; height: 16px"/></hbox>
-  </vbox>
-</window>
diff --git a/toolkit/themes/osx/reftests/checkboxsize.xhtml b/toolkit/themes/osx/reftests/checkboxsize.xhtml
deleted file mode 100644
index 1e5c62535e..0000000000
--- a/toolkit/themes/osx/reftests/checkboxsize.xhtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="data:text/css,
-vbox { height: 50px; }
-checkbox {
-  color: transparent;
-  margin: 0;
-}
-" type="text/css"?>
-
-<window title="Checkboxes with mini, small and regular control font"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <vbox style="font-size: 9px">
-    <hbox><checkbox native="true" label="Mini"/></hbox>
-  </vbox>
-  <vbox style="font: message-box">
-    <hbox><checkbox native="true" label="Small"/></hbox>
-  </vbox>
-  <vbox style="font: menu">
-    <hbox><checkbox native="true" label="Regular"/></hbox>
-  </vbox>
-  <vbox style="font-size: 9px">
-    <hbox><checkbox native="true" label="Mini" checked="true"/></hbox>
-  </vbox>
-  <vbox style="font: message-box">
-    <hbox><checkbox native="true" label="Small" checked="true"/></hbox>
-  </vbox>
-  <vbox style="font: menu">
-    <hbox><checkbox native="true" label="Regular" checked="true"/></hbox>
-  </vbox>
-</window>
diff --git a/toolkit/themes/osx/reftests/radiosize-ref.xhtml b/toolkit/themes/osx/reftests/radiosize-ref.xhtml
deleted file mode 100644
index 219d898082..0000000000
--- a/toolkit/themes/osx/reftests/radiosize-ref.xhtml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-
-<window title="Reference for mini, small and regular radio button sizes"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml">
-    vbox { height: 50px; }
-    box {
-      appearance: auto;
-      -moz-default-appearance: radio;
-      margin-left: 2px;
-      margin-top: 1px;
-    }
-  </style>
-  <vbox>
-    <hbox><box style="width: 11px; height: 11px;"/></hbox>
-  </vbox>
-  <vbox>
-    <hbox><box style="width: 13px; height: 13px;"/></hbox>
-  </vbox>
-  <vbox>
-    <hbox><box style="width: 16px; height: 16px;"/></hbox>
-  </vbox>
-  <vbox>
-    <hbox selected="true"><box style="width: 11px; height: 11px"/></hbox>
-  </vbox>
-  <vbox>
-    <hbox selected="true"><box style="width: 13px; height: 13px"/></hbox>
-  </vbox>
-  <vbox>
-    <hbox selected="true"><box style="width: 16px; height: 16px"/></hbox>
-  </vbox>
-</window>
diff --git a/toolkit/themes/osx/reftests/radiosize.xhtml b/toolkit/themes/osx/reftests/radiosize.xhtml
deleted file mode 100644
index 15b4d5dd92..0000000000
--- a/toolkit/themes/osx/reftests/radiosize.xhtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="data:text/css,
-vbox { height: 50px; }
-radio {
-  color: transparent;
-  margin: 0;
-}
-" type="text/css"?>
-
-<window title="Radio buttons with mini, small and regular control font"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <vbox style="font-size: 9px">
-    <hbox><radio label="Mini"/></hbox>
-  </vbox>
-  <vbox style="font: message-box">
-    <hbox><radio label="Small"/></hbox>
-  </vbox>
-  <vbox style="font: menu">
-    <hbox><radio label="Regular"/></hbox>
-  </vbox>
-  <vbox style="font-size: 9px">
-    <hbox><radio label="Mini" selected="true"/></hbox>
-  </vbox>
-  <vbox style="font: message-box">
-    <hbox><radio label="Small" selected="true"/></hbox>
-  </vbox>
-  <vbox style="font: menu">
-    <hbox><radio label="Regular" selected="true"/></hbox>
-  </vbox>
-</window>
diff --git a/toolkit/themes/osx/reftests/reftest.list b/toolkit/themes/osx/reftests/reftest.list
deleted file mode 100644
index 35a890d4b3..0000000000
--- a/toolkit/themes/osx/reftests/reftest.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# This folder is registered in the chrome manifest at layout/tools/reftest/jar.mn.
-defaults pref(widget.non-native-theme.enabled,false) # These are tests for the native theme.
-
-skip-if(!cocoaWidget) == chrome://reftest/content/osx-theme/radiosize.xhtml chrome://reftest/content/osx-theme/radiosize-ref.xhtml
-skip-if(!cocoaWidget) == chrome://reftest/content/osx-theme/checkboxsize.xhtml chrome://reftest/content/osx-theme/checkboxsize-ref.xhtml