Fixed a merge error
authortero.turtiainen
Sat, 19 Apr 2008 18:53:32 +0300
changeset 16856 faaea5c126cbaedde61187f06036379a48a3bef7
parent 16855 9b2d765184f0a9fbb276e461ae666f7009771dd5
child 16857 9f87bb9ae5ded3d97f799d07e71f37d5c31c4051
push id1298
push userpavlov@mozilla.com
push dateSun, 17 Aug 2008 05:03:09 +0000
treeherderautoland@4a506fa751d8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.0a1pre
Fixed a merge error
widget/src/qt/nsNativeThemeQt.cpp
--- a/widget/src/qt/nsNativeThemeQt.cpp
+++ b/widget/src/qt/nsNativeThemeQt.cpp
@@ -412,27 +412,27 @@ nsNativeThemeQt::GetMinimumWidgetSize(ns
         break;
     }
     case NS_THEME_SCROLLBAR_BUTTON_UP:
     case NS_THEME_SCROLLBAR_BUTTON_DOWN:
     case NS_THEME_SCROLLBAR_BUTTON_LEFT:
     case NS_THEME_SCROLLBAR_BUTTON_RIGHT:
         (*aResult).width = s->pixelMetric(QStyle::PM_ScrollBarExtent);
         (*aResult).height = (*aResult).width;
-        *aIsOverridable = PR_FALSE;
+        //*aIsOverridable = PR_FALSE;
         break;
     case NS_THEME_SCROLLBAR_THUMB_VERTICAL:
         (*aResult).width = s->pixelMetric(QStyle::PM_ScrollBarExtent);
         (*aResult).height = s->pixelMetric(QStyle::PM_ScrollBarSliderMin);
-        *aIsOverridable = PR_FALSE;
+        //*aIsOverridable = PR_FALSE;
         break;
     case NS_THEME_SCROLLBAR_THUMB_HORIZONTAL:
         (*aResult).width = s->pixelMetric(QStyle::PM_ScrollBarSliderMin);
         (*aResult).height = s->pixelMetric(QStyle::PM_ScrollBarExtent);
-        *aIsOverridable = PR_FALSE;
+        //*aIsOverridable = PR_FALSE;
         break;
     case NS_THEME_SCROLLBAR_TRACK_VERTICAL:
         (*aResult).width = s->pixelMetric(QStyle::PM_ScrollBarExtent);
         (*aResult).height = s->pixelMetric(QStyle::PM_SliderLength);
         break;
     case NS_THEME_SCROLLBAR_TRACK_HORIZONTAL:
         (*aResult).width = s->pixelMetric(QStyle::PM_SliderLength);
         (*aResult).height = s->pixelMetric(QStyle::PM_ScrollBarExtent);