Bug 1355752 - Remove B2G code from nsFormControlFrame.cpp & forms.css. r=dholbert

MozReview-Commit-ID: I1PeSxMLFbn

--HG--
extra : rebase_source : eafb99a5df41053e7ea51b8d9529b6a343152cfd

layout/forms/nsFormControlFrame.cpp

@@ -49,7 +49,7 @@ nsFormControlFrame::GetMinISize(nsRenderingContext *aRenderingContext)
 {
   nscoord result;
   DISPLAY_MIN_WIDTH(this, result);
-#if !defined(MOZ_WIDGET_ANDROID) && !defined(MOZ_WIDGET_GONK)
+#if !defined(MOZ_WIDGET_ANDROID)
   result = StyleDisplay()->UsedAppearance() == NS_THEME_NONE ? 0 : DefaultSize();
 #else
   result = DefaultSize();
@@ -62,7 +62,7 @@ nsFormControlFrame::GetPrefISize(nsRenderingContext *aRenderingContext)
 {
   nscoord result;
   DISPLAY_PREF_WIDTH(this, result);
-#if !defined(MOZ_WIDGET_ANDROID) && !defined(MOZ_WIDGET_GONK)
+#if !defined(MOZ_WIDGET_ANDROID)
   result = StyleDisplay()->UsedAppearance() == NS_THEME_NONE ? 0 : DefaultSize();
 #else
   result = DefaultSize();
@@ -82,7 +82,7 @@ nsFormControlFrame::ComputeAutoSize(nsRenderingContext* aRC,
                                     ComputeSizeFlags    aFlags)
 {
   LogicalSize size(aWM, 0, 0);
-#if !defined(MOZ_WIDGET_ANDROID) && !defined(MOZ_WIDGET_GONK)
+#if !defined(MOZ_WIDGET_ANDROID)
   if (StyleDisplay()->UsedAppearance() == NS_THEME_NONE) {
     return size;
   }

layout/style/res/forms.css

@@ -598,7 +598,7 @@ input[type="checkbox"]:disabled:hover:active {
   cursor: inherit;
 }
 
-%if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GONK)
+%if defined(MOZ_WIDGET_ANDROID)
 /*
  * These platforms doesn't have any theming support and thus appearance:none
  * is the same as any other appearance value.
@@ -677,7 +677,7 @@ input[type="checkbox"]:indeterminate:disabled {
   background-image: url(indeterminate-checkmark.svg#disabled);
 }
 
-%endif /* defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GONK) */
+%endif /* defined(MOZ_WIDGET_ANDROID) */
 
 % On Mac, the native theme takes care of this.
 % See nsNativeThemeCocoa::ThemeDrawsFocusForWidget.