From f27da241e1f3275eb32e6d0f60772da2f821f6cd Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Wed, 20 Feb 2013 11:03:53 +1300
Subject: [PATCH] b=842468 include border in scrollbar track min size r=roc

--HG--
extra : rebase_source : dd5ac0d701b9587a18e4cb104b517fe78e4207af
---
 widget/gtk2/nsNativeThemeGTK.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/widget/gtk2/nsNativeThemeGTK.cpp b/widget/gtk2/nsNativeThemeGTK.cpp
index 8108a07732c..c71f445f666 100644
--- a/widget/gtk2/nsNativeThemeGTK.cpp
+++ b/widget/gtk2/nsNativeThemeGTK.cpp
@@ -1052,9 +1052,9 @@ nsNativeThemeGTK::GetMinimumWidgetSize(nsRenderingContext* aContext,
       moz_gtk_get_scrollbar_metrics(&metrics);
 
       if (aWidgetType == NS_THEME_SCROLLBAR_TRACK_VERTICAL)
-        aResult->width = metrics.slider_width;
+        aResult->width = metrics.slider_width + 2 * metrics.trough_border;
       else
-        aResult->height = metrics.slider_width;
+        aResult->height = metrics.slider_width + 2 * metrics.trough_border;
 
       *aIsOverridable = false;
     }