Bug 579517 - Part 8: Automatically convert some more NSPR numeric type usages that were landed on mozilla-inbound; r=bsmedberg

dom/ipc/TabParent.h

@@ -107,7 +107,7 @@ public:
     virtual bool RecvGetWidgetNativeData(WindowsHandle* aValue);
     virtual bool RecvZoomToRect(const gfxRect& aRect);
     virtual bool RecvContentReceivedTouch(const bool& aPreventDefault);
-    virtual PContentDialogParent* AllocPContentDialog(const PRUint32& aType,
+    virtual PContentDialogParent* AllocPContentDialog(const uint32_t& aType,
                                                       const nsCString& aName,
                                                       const nsCString& aFeatures,
                                                       const InfallibleTArray<int>& aIntParams,

gfx/layers/ipc/Axis.cpp

@@ -186,7 +186,7 @@ Axis::Overscroll Axis::DisplacementWillOverscroll(int32_t aDisplacement) {
   return OVERSCROLL_NONE;
 }
 
-float Axis::DisplacementWillOverscrollAmount(PRInt32 aDisplacement) {
+float Axis::DisplacementWillOverscrollAmount(int32_t aDisplacement) {
   switch (DisplacementWillOverscroll(aDisplacement)) {
   case OVERSCROLL_MINUS: return (GetOrigin() + aDisplacement) - GetPageStart();
   case OVERSCROLL_PLUS: return (GetViewportEnd() + aDisplacement) - GetPageEnd();
@@ -196,7 +196,7 @@ float Axis::DisplacementWillOverscrollAmount(PRInt32 aDisplacement) {
   }
 }
 
-Axis::Overscroll Axis::ScaleWillOverscroll(float aScale, PRInt32 aFocus) {
+Axis::Overscroll Axis::ScaleWillOverscroll(float aScale, int32_t aFocus) {
   float originAfterScale = (GetOrigin() + aFocus) * aScale - aFocus;
 
   bool both = ScaleWillOverscrollBothSides(aScale);
@@ -215,7 +215,7 @@ Axis::Overscroll Axis::ScaleWillOverscroll(float aScale, PRInt32 aFocus) {
   return OVERSCROLL_NONE;
 }
 
-float Axis::ScaleWillOverscrollAmount(float aScale, PRInt32 aFocus) {
+float Axis::ScaleWillOverscrollAmount(float aScale, int32_t aFocus) {
   float originAfterScale = (GetOrigin() + aFocus) * aScale - aFocus;
   switch (ScaleWillOverscroll(aScale, aFocus)) {
   case OVERSCROLL_MINUS: return originAfterScale - GetPageStart() * aScale;

gfx/layers/ipc/Axis.h

@@ -132,7 +132,7 @@ public:
    * If a displacement will overscroll the axis, this returns the amount and in
    * what direction. Similar to getExcess() but takes a displacement to apply.
    */
-  float DisplacementWillOverscrollAmount(PRInt32 aDisplacement);
+  float DisplacementWillOverscrollAmount(int32_t aDisplacement);
 
   /**
    * Gets the overscroll state of the axis given a scaling of the page. That is
@@ -153,7 +153,7 @@ public:
    * scroll offset in such a way that it remains in the same place on the page
    * relative.
    */
-  float ScaleWillOverscrollAmount(float aScale, PRInt32 aFocus);
+  float ScaleWillOverscrollAmount(float aScale, int32_t aFocus);
 
   /**
    * Checks if an axis will overscroll in both directions by computing the

widget/gtk2/nsFilePicker.cpp

@@ -542,7 +542,7 @@ nsFilePicker::Done(GtkWidget* file_chooser, gint response)
 {
   mRunning = false;
 
-  PRInt16 result;
+  int16_t result;
   switch (response) {
     case GTK_RESPONSE_OK:
     case GTK_RESPONSE_ACCEPT:

widget/gtk2/nsFilePicker.h

@@ -57,9 +57,9 @@ protected:
   nsCOMPtr<nsIFilePickerShownCallback> mCallback;
   nsCOMArray<nsIFile> mFiles;
 
-  PRInt16   mMode;
-  PRInt16   mSelectedType;
-  PRInt16   mResult;
+  int16_t   mMode;
+  int16_t   mSelectedType;
+  int16_t   mResult;
   bool      mRunning;
   bool      mAllowURLs;
   nsCString mFileURL;