Back out bug 350766's scrollbar metrics r+sr=roc

widget/public/nsILookAndFeel.h

@@ -44,10 +44,10 @@
 struct nsSize;
 
 
-// {CE295E90-FF53-4013-96AE-67B5762292A9}
+// {BEC234D0-AAA5-430D-8435-B10100F78003}
 #define NS_ILOOKANDFEEL_IID \
-{ 0xce295e90, 0xff53, 0x4013, \
-    { 0x96, 0xae, 0x67, 0xb5, 0x76, 0x22, 0x92, 0xa9 } }
+{ 0xbec234d0, 0xaaa5, 0x430d, \
+    { 0x84, 0x35, 0xb1, 0x01, 0x00, 0xf7, 0x80, 0x03} }
 
 
 class nsILookAndFeel: public nsISupports {
@@ -199,9 +199,6 @@ public:
     eMetric_ScrollArrowStyle,                             // position of scroll arrows in a scrollbar
     eMetric_ScrollSliderStyle,                            // is scroll thumb proportional or fixed?
 
-    eMetric_ScrollbarWidth,                               // width of a vertical scrollbar
-    eMetric_ScrollbarHeight,                              // height of horizontal scrollbar
- 
     eMetric_ScrollButtonLeftMouseButtonAction,            // each button can take one of four values:
     eMetric_ScrollButtonMiddleMouseButtonAction,          // 0 - scrolls one  line, 1 - scrolls one page
     eMetric_ScrollButtonRightMouseButtonAction,           // 2 - scrolls to end, 3 - button ignored

widget/src/cocoa/nsLookAndFeel.mm

@@ -531,14 +531,6 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
     case eMetric_DragThresholdY:
       aMetric = 4;
       break;
-    case eMetric_ScrollbarHeight: // height of horizontal scrollbar
-    case eMetric_ScrollbarWidth: // width of vertical scrollbar
-                                 // It would be nice to use the native metric function, but we have always
-                                 // used 16 before and it returns 15. We should make the change, but with a
-                                 // complete audit to make sure things match up.
-                                 // ::GetThemeMetric(kThemeMetricScrollBarWidth, (SInt32*)&aMetric);
-      aMetric = 16;
-      break;
     case eMetric_ScrollArrowStyle:
       ThemeScrollBarArrowStyle arrowStyle;
       ::GetThemeScrollBarArrowStyle ( &arrowStyle );

widget/src/gtk2/nsLookAndFeel.cpp

@@ -509,14 +509,6 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
     case eMetric_ScrollSliderStyle:
         aMetric = eMetric_ScrollThumbStyleProportional;
         break;
-    case eMetric_ScrollbarWidth:
-    case eMetric_ScrollbarHeight:
-        {
-            MozGtkScrollbarMetrics metrics;
-            moz_gtk_get_scrollbar_metrics(&metrics);
-            aMetric = metrics.stepper_size;
-        }
-        break;
     case eMetric_TreeOpenDelay:
         aMetric = 1000;
         break;

widget/src/mac/nsLookAndFeel.cpp

@@ -546,14 +546,6 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
     case eMetric_DragThresholdY:
         aMetric = 4;
         break;
-    case eMetric_ScrollbarHeight: // height of horizontal scrollbar
-    case eMetric_ScrollbarWidth: // width of vertical scrollbar
-        // It would be nice to use the native metric function, but we have always
-        // used 16 before and it returns 15. We should make the change, but with a
-        // complete audit to make sure things match up.
-        // ::GetThemeMetric(kThemeMetricScrollBarWidth, (SInt32*)&aMetric);
-        aMetric = 16;
-        break;
     case eMetric_ScrollArrowStyle:
         ThemeScrollBarArrowStyle arrowStyle;
         ::GetThemeScrollBarArrowStyle ( &arrowStyle );

widget/src/windows/nsLookAndFeel.cpp

@@ -423,12 +423,6 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
     case eMetric_ScrollSliderStyle:
         aMetric = eMetric_ScrollThumbStyleProportional;
         break;
-    case eMetric_ScrollbarHeight:
-        aMetric = ::GetSystemMetrics(SM_CXVSCROLL);
-        break;
-    case eMetric_ScrollbarWidth:
-        aMetric = ::GetSystemMetrics(SM_CXHSCROLL);
-        break;
     case eMetric_TreeOpenDelay:
         aMetric = 1000;
         break;