From 3d4f3c06cfe41c42bfea68460c695c35109083e5 Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Sat, 18 Jul 2009 18:08:18 +0200
Subject: [PATCH] Backed out bug 501957 (changeset 29fb65d31455) because it
 caused test_contextmenu_list.xul failures.

---
 toolkit/themes/pinstripe/global/checkbox.css  | 11 +++----
 toolkit/themes/pinstripe/global/radio.css     | 10 ++----
 .../pinstripe/reftests/checkboxsize-ref.xul   | 31 -------------------
 .../pinstripe/reftests/checkboxsize.xul       | 31 -------------------
 .../pinstripe/reftests/radiosize-ref.xul      | 31 -------------------
 .../themes/pinstripe/reftests/radiosize.xul   | 31 -------------------
 .../themes/pinstripe/reftests/reftest.list    |  2 --
 7 files changed, 7 insertions(+), 140 deletions(-)
 delete mode 100644 toolkit/themes/pinstripe/reftests/checkboxsize-ref.xul
 delete mode 100644 toolkit/themes/pinstripe/reftests/checkboxsize.xul
 delete mode 100644 toolkit/themes/pinstripe/reftests/radiosize-ref.xul
 delete mode 100644 toolkit/themes/pinstripe/reftests/radiosize.xul

diff --git a/toolkit/themes/pinstripe/global/checkbox.css b/toolkit/themes/pinstripe/global/checkbox.css
index cc7022a2377..d2f4268b994 100644
--- a/toolkit/themes/pinstripe/global/checkbox.css
+++ b/toolkit/themes/pinstripe/global/checkbox.css
@@ -46,7 +46,7 @@
 checkbox {
   -moz-appearance: checkbox-container;
   -moz-box-align: center;
-  margin: 2px 2px 4px;
+  margin: 2px 2px 4px 2px;
 }
 
 .checkbox-label-box {
@@ -73,12 +73,9 @@ checkbox[disabled="true"] {
 
 .checkbox-check {
   -moz-appearance: checkbox;
-  margin: 0 1px;
-  /* vertical-align tells native theming where to snap to. However, this doesn't
-   * always work reliably because of bug 503833. */
-  vertical-align: top;
-  width: 1.3em;
-  height: 1.3em;
+  margin: 1px;
+  width: 16px;
+  height: 16px;
 }
   
 
diff --git a/toolkit/themes/pinstripe/global/radio.css b/toolkit/themes/pinstripe/global/radio.css
index 16038fed40f..300d78a0db6 100644
--- a/toolkit/themes/pinstripe/global/radio.css
+++ b/toolkit/themes/pinstripe/global/radio.css
@@ -50,7 +50,7 @@ radiogroup {
 radio {
   -moz-appearance: radio-container;
   -moz-box-align: center;
-  margin: 2px 2px 4px;
+  margin: 2px 2px 2px 2px;
   -moz-user-focus: ignore;
 }
 
@@ -78,10 +78,6 @@ radio[disabled="true"] {
 
 .radio-check, .radio-check-box1 {
   -moz-appearance: radio;
-  margin: -1px 1px 1px;
-  /* vertical-align tells native theming where to snap to. However, this doesn't
-   * always work reliably because of bug 503833. */
-  vertical-align: bottom;
-  width: 1.3em;
-  height: 1.3em;
+  width: 16px;
+  height: 16px;
 }
diff --git a/toolkit/themes/pinstripe/reftests/checkboxsize-ref.xul b/toolkit/themes/pinstripe/reftests/checkboxsize-ref.xul
deleted file mode 100644
index 44f37b77918..00000000000
--- a/toolkit/themes/pinstripe/reftests/checkboxsize-ref.xul
+++ /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; }
-box {
-  -moz-appearance: checkbox;
-  margin-left: 2px;
-}
-" type="text/css"?>
-
-<window title="Reference for mini, small and regular checkbox sizes"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <vbox>
-    <hbox><box width="11" height="11"/></hbox>
-  </vbox>
-  <vbox>
-    <hbox><box width="13" height="13"/></hbox>
-  </vbox>
-  <vbox>
-    <hbox><box width="16" height="16"/></hbox>
-  </vbox>
-  <vbox>
-    <hbox checked="true"><box width="11" height="11"/></hbox>
-  </vbox>
-  <vbox>
-    <hbox checked="true"><box width="13" height="13"/></hbox>
-  </vbox>
-  <vbox>
-    <hbox checked="true"><box width="16" height="16"/></hbox>
-  </vbox>
-</window>
diff --git a/toolkit/themes/pinstripe/reftests/checkboxsize.xul b/toolkit/themes/pinstripe/reftests/checkboxsize.xul
deleted file mode 100644
index 55429ef8f81..00000000000
--- a/toolkit/themes/pinstripe/reftests/checkboxsize.xul
+++ /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 label="Mini"/></hbox>
-  </vbox>
-  <vbox style="font: message-box">
-    <hbox><checkbox label="Small"/></hbox>
-  </vbox>
-  <vbox style="font: -moz-dialog">
-    <hbox><checkbox label="Regular"/></hbox>
-  </vbox>
-  <vbox style="font-size: 9px">
-    <hbox><checkbox label="Mini" checked="true"/></hbox>
-  </vbox>
-  <vbox style="font: message-box">
-    <hbox><checkbox label="Small" checked="true"/></hbox>
-  </vbox>
-  <vbox style="font: -moz-dialog">
-    <hbox><checkbox label="Regular" checked="true"/></hbox>
-  </vbox>
-</window>
diff --git a/toolkit/themes/pinstripe/reftests/radiosize-ref.xul b/toolkit/themes/pinstripe/reftests/radiosize-ref.xul
deleted file mode 100644
index 0f71ad56c8a..00000000000
--- a/toolkit/themes/pinstripe/reftests/radiosize-ref.xul
+++ /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; }
-box {
-  -moz-appearance: radio;
-  margin-left: 2px;
-}
-" 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">
-  <vbox>
-    <hbox><box width="11" height="11"/></hbox>
-  </vbox>
-  <vbox>
-    <hbox><box width="13" height="13"/></hbox>
-  </vbox>
-  <vbox>
-    <hbox><box width="16" height="16"/></hbox>
-  </vbox>
-  <vbox>
-    <hbox selected="true"><box width="11" height="11"/></hbox>
-  </vbox>
-  <vbox>
-    <hbox selected="true"><box width="13" height="13"/></hbox>
-  </vbox>
-  <vbox>
-    <hbox selected="true"><box width="16" height="16"/></hbox>
-  </vbox>
-</window>
diff --git a/toolkit/themes/pinstripe/reftests/radiosize.xul b/toolkit/themes/pinstripe/reftests/radiosize.xul
deleted file mode 100644
index 44f735db07f..00000000000
--- a/toolkit/themes/pinstripe/reftests/radiosize.xul
+++ /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: -moz-dialog">
-    <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: -moz-dialog">
-    <hbox><radio label="Regular" selected="true"/></hbox>
-  </vbox>
-</window>
diff --git a/toolkit/themes/pinstripe/reftests/reftest.list b/toolkit/themes/pinstripe/reftests/reftest.list
index 90072fda993..41c9ff1e2e0 100644
--- a/toolkit/themes/pinstripe/reftests/reftest.list
+++ b/toolkit/themes/pinstripe/reftests/reftest.list
@@ -1,3 +1 @@
 skip-if(MOZ_WIDGET_TOOLKIT!="cocoa") == 482681.xul 482681-ref.xul
-skip-if(MOZ_WIDGET_TOOLKIT!="cocoa") == radiosize.xul radiosize-ref.xul
-skip-if(MOZ_WIDGET_TOOLKIT!="cocoa") == checkboxsize.xul checkboxsize-ref.xul