Issue #1829 - Revert "Issue #1751 -- Remove XP_MACOSX conditionals from /layout"

This reverts commit aa0fd3d68c856504646e1d7eb499bc890ef44101.

2 files changed, 14 insertions, 1 deletions

diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp
index b3c4ccc148..65f42805de 100644
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -6647,7 +6647,14 @@ nsComputedDOMStyle::DoGetAnimationIterationCount()
     RefPtr<nsROCSSPrimitiveValue> iterationCount = new nsROCSSPrimitiveValue;
 
     float f = animation->GetIterationCount();
-    float inf = NS_IEEEPositiveInfinity();
+    /* Need a nasty hack here to work around an optimizer bug in gcc
+       4.2 on Mac, which somehow gets confused when directly comparing
+       a float to the return value of NS_IEEEPositiveInfinity when
+       building 32-bit builds. */
+#ifdef XP_MACOSX
+    volatile
+#endif
+      float inf = NS_IEEEPositiveInfinity();
     if (f == inf) {
       iterationCount->SetIdent(eCSSKeyword_infinite);
     } else {
diff --git a/layout/style/res/forms.css b/layout/style/res/forms.css
index 281b75d769..db75151d48 100644
--- a/layout/style/res/forms.css
+++ b/layout/style/res/forms.css
@@ -593,11 +593,15 @@ input[type="checkbox"]:disabled:hover:active {
   cursor: inherit;
 }
 
+% On Mac, the native theme takes care of this.
+% See nsNativeThemeCocoa::ThemeDrawsFocusForWidget.
+%ifndef XP_MACOSX
 input[type="checkbox"]:-moz-focusring,
 input[type="radio"]:-moz-focusring {
   /* Don't specify the outline-color, we should always use initial value. */
   outline: 1px dotted;
 }
+%endif
 
 input[type="checkbox"]:hover:active,
 input[type="radio"]:hover:active {
@@ -719,10 +723,12 @@ input[type="color"]:-moz-system-metric(color-picker-available):active:hover,
 input[type="reset"]:active:hover,
 input[type="button"]:active:hover,
 input[type="submit"]:active:hover {
+%ifndef XP_MACOSX
   padding-block-start: 0px;
   padding-inline-end: 5px;
   padding-block-end: 0px;
   padding-inline-start: 7px;
+%endif
   border-style: inset;
   background-color: ButtonFace;
 }