Bug 1478385: Fix confusion in GetCachedWidgetBorder. r?karlt draft
authorEmilio Cobos Álvarez <emilio@crisal.io>
Wed, 25 Jul 2018 16:55:38 +0200
changeset 822635 fd8cfd827888eb710806016ab4f699859bd95077
parent 822634 9abe7cacc5067fd56d93120ece4a539b3b71ee9d
push id117415
push userbmo:emilio@crisal.io
push dateWed, 25 Jul 2018 14:58:09 +0000
reviewerskarlt
bugs1478385
milestone63.0a1
Bug 1478385: Fix confusion in GetCachedWidgetBorder. r?karlt aWidgetType is a NS_THEME_* constant. What this code is comparing is not. Is this comparison needed at all? This was exposed by a patch of mine converting -moz-appearance to be an enum class. MozReview-Commit-ID: 9BsbYk04vop
widget/gtk/nsNativeThemeGTK.cpp
--- a/widget/gtk/nsNativeThemeGTK.cpp
+++ b/widget/gtk/nsNativeThemeGTK.cpp
@@ -1273,17 +1273,17 @@ nsNativeThemeGTK::GetCachedWidgetBorder(
     uint8_t cacheIndex = gtkWidgetType / 8;
     uint8_t cacheBit = 1u << (gtkWidgetType % 8);
 
     if (mBorderCacheValid[cacheIndex] & cacheBit) {
       *aResult = mBorderCache[gtkWidgetType];
     } else {
       moz_gtk_get_widget_border(gtkWidgetType, &aResult->left, &aResult->top,
                                 &aResult->right, &aResult->bottom, aDirection);
-      if (aWidgetType != MOZ_GTK_DROPDOWN) { // depends on aDirection
+      if (gtkWidgetType != MOZ_GTK_DROPDOWN) { // depends on aDirection
         mBorderCacheValid[cacheIndex] |= cacheBit;
         mBorderCache[gtkWidgetType] = *aResult;
       }
     }
   }
 }
 
 LayoutDeviceIntMargin