bug 454292:prbool fixes for layout r+sr=dbaron
authorTaras Glek <tglek@mozilla.com>
Tue, 09 Sep 2008 10:07:26 -0700
changeset 19015 4a1ad24a36bcdd67c3b9498e70c0ee6a8c3f9f44
parent 19014 4b9f9c1f7e1deb1d2c5b566c538dfe200dbdded6
child 19016 957eab222b84b9dc4b4a0e67249567ff0761c9c2
push id1910
push usertglek@mozilla.com
push dateTue, 09 Sep 2008 17:07:33 +0000
treeherdermozilla-central@4a1ad24a36bc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs454292
milestone1.9.1b1pre
bug 454292:prbool fixes for layout r+sr=dbaron
layout/forms/nsFileControlFrame.h
layout/xul/base/src/nsSliderFrame.cpp
--- a/layout/forms/nsFileControlFrame.h
+++ b/layout/forms/nsFileControlFrame.h
@@ -177,17 +177,17 @@ private:
   /**
    * Copy an attribute from file content to text and button content.
    * @param aNameSpaceID namespace of attr
    * @param aAttribute attribute atom
    * @param aWhichControls which controls to apply to (SYNC_TEXT or SYNC_FILE
    *        or SYNC_BOTH)
    */
   void SyncAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute,
-                PRBool aWhichControls);
+                PRInt32 aWhichControls);
 
   NS_IMETHOD_(nsrefcnt) AddRef() { return 1; }
   NS_IMETHOD_(nsrefcnt) Release() { return 1; }
 };
 
 #endif
 
 
--- a/layout/xul/base/src/nsSliderFrame.cpp
+++ b/layout/xul/base/src/nsSliderFrame.cpp
@@ -84,20 +84,20 @@ GetContentOfBox(nsIBox *aBox)
   nsIContent* content = aBox->GetContent();
   NS_IF_ADDREF(content);
   return content;
 }
 
 // Helper function to collect the "scroll to click" metric. Beware of
 // caching this, users expect to be able to change the system preference
 // and see the browser change its behavior immediately.
-static PRInt32
+static PRBool
 GetScrollToClick()
 {
-  PRInt32 scrollToClick = PR_FALSE;
+  PRBool scrollToClick = PR_FALSE;
   nsresult rv;
   nsCOMPtr<nsILookAndFeel> lookNFeel =
     do_GetService("@mozilla.org/widget/lookandfeel;1", &rv);
   if (NS_SUCCEEDED(rv)) {
     PRInt32 scrollToClickMetric;
     rv = lookNFeel->GetMetric(nsILookAndFeel::eMetric_ScrollToClick,
                               scrollToClickMetric);
     if (NS_SUCCEEDED(rv) && scrollToClickMetric == 1)