Bug 847480 - Convert DeprecatedAbs uses that can relatively obviously…

… be changd to Abs, to Abs. r=Ms2ger
shellylin · Mar 5, 2013 · b30b419 · b30b419
1 parent f915a6c
commit b30b419
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 17 deletions.
diff --git a/content/canvas/src/CanvasRenderingContext2D.cpp b/content/canvas/src/CanvasRenderingContext2D.cpp
@@ -3716,8 +3716,8 @@ CanvasRenderingContext2D::CreateImageData(JSContext* cx, double sw,
   int32_t wi = JS_DoubleToInt32(sw);
   int32_t hi = JS_DoubleToInt32(sh);
 
-  uint32_t w = DeprecatedAbs(wi);
-  uint32_t h = DeprecatedAbs(hi);
+  uint32_t w = Abs(wi);
+  uint32_t h = Abs(hi);
   return mozilla::dom::CreateImageData(cx, this, w, h, error);
 }
 

diff --git a/gfx/layers/basic/BasicTiledThebesLayer.cpp b/gfx/layers/basic/BasicTiledThebesLayer.cpp
@@ -376,7 +376,7 @@ BasicTiledThebesLayer::ComputeProgressiveUpdateRegion(BasicTiledLayerBuffer& aTi
     if (!aRegionToPaint.IsEmpty()) {
       break;
     }
-    if (DeprecatedAbs(scrollDiffY) >= DeprecatedAbs(scrollDiffX)) {
+    if (Abs(scrollDiffY) >= Abs(scrollDiffX)) {
       tileBounds.x += incX;
     } else {
       tileBounds.y += incY;

diff --git a/js/src/ion/RangeAnalysis.h b/js/src/ion/RangeAnalysis.h
@@ -344,8 +344,7 @@ class Range : public TempObject {
             return;
         }
 
-        uint32_t max = Max(mozilla::DeprecatedAbs<int64_t>(lower()),
-                           mozilla::DeprecatedAbs<int64_t>(upper()));
+        uint32_t max = Max(mozilla::Abs<int64_t>(lower()), mozilla::Abs<int64_t>(upper()));
         JS_ASSERT_IF(lower() == JSVAL_INT_MIN, max == (uint32_t) JSVAL_INT_MIN);
         JS_ASSERT(max <= (uint32_t) JSVAL_INT_MIN);
         // The number of bits needed to encode |max| is the power of 2 plus one.

diff --git a/js/src/ion/arm/MacroAssembler-arm.cpp b/js/src/ion/arm/MacroAssembler-arm.cpp
@@ -14,7 +14,7 @@
 using namespace js;
 using namespace ion;
 
-using mozilla::DeprecatedAbs;
+using mozilla::Abs;
 
 bool
 isValueDTRDCandidate(ValueOperand &val)
@@ -2526,7 +2526,7 @@ MacroAssemblerARMCompat::storeValue(ValueOperand val, Operand dst) {
 void
 MacroAssemblerARMCompat::storeValue(ValueOperand val, const BaseIndex &dest)
 {
-    if (isValueDTRDCandidate(val) && DeprecatedAbs(dest.offset) <= 255) {
+    if (isValueDTRDCandidate(val) && Abs(dest.offset) <= 255) {
         Register tmpIdx;
         if (dest.offset == 0) {
             if (dest.scale == TimesOne) {
@@ -2550,7 +2550,7 @@ MacroAssemblerARMCompat::storeValue(ValueOperand val, const BaseIndex &dest)
 void
 MacroAssemblerARMCompat::loadValue(const BaseIndex &addr, ValueOperand val)
 {
-    if (isValueDTRDCandidate(val) && DeprecatedAbs(addr.offset) <= 255) {
+    if (isValueDTRDCandidate(val) && Abs(addr.offset) <= 255) {
         Register tmpIdx;
         if (addr.offset == 0) {
             if (addr.scale == TimesOne) {

diff --git a/js/src/methodjit/FastArithmetic.cpp b/js/src/methodjit/FastArithmetic.cpp
@@ -21,7 +21,7 @@ using namespace js::mjit;
 using namespace js::analyze;
 using namespace JSC;
 
-using mozilla::DeprecatedAbs;
+using mozilla::Abs;
 
 typedef JSC::MacroAssembler::FPRegisterID FPRegisterID;
 
@@ -333,7 +333,7 @@ mjit::Compiler::jsop_binary_double(FrameEntry *lhs, FrameEntry *rhs, JSOp op,
         (type == JSVAL_TYPE_INT32 ||
          (type == JSVAL_TYPE_UNKNOWN &&
           !(lhs->isConstant() && lhs->isType(JSVAL_TYPE_INT32) &&
-            DeprecatedAbs(lhs->getValue().toInt32()) == 1))))
+            Abs(lhs->getValue().toInt32()) == 1))))
     {
         RegisterID reg = frame.allocReg();
         FPRegisterID fpReg = frame.allocFPReg();

diff --git a/widget/gtk2/nsNativeKeyBindings.cpp b/widget/gtk2/nsNativeKeyBindings.cpp
@@ -99,8 +99,8 @@ delete_from_cursor_cb(GtkWidget *w, GtkDeleteType del_type,
   if (!cmd)
     return; // unsupported command
 
-  count = DeprecatedAbs(count);
-  for (int i = 0; i < count; ++i) {
+  unsigned int absCount = Abs(count);
+  for (unsigned int i = 0; i < absCount; ++i) {
     gCurrentCallback(cmd, gCurrentCallbackData);
   }
 }
@@ -169,8 +169,8 @@ move_cursor_cb(GtkWidget *w, GtkMovementStep step, gint count,
     return; // unsupported command
 
 
-  count = DeprecatedAbs(count);
-  for (int i = 0; i < count; ++i) {
+  unsigned int absCount = Abs(count);
+  for (unsigned int i = 0; i < absCount; ++i) {
     gCurrentCallback(cmd, gCurrentCallbackData);
   }
 }

diff --git a/widget/nsGUIEvent.h b/widget/nsGUIEvent.h
@@ -1344,7 +1344,7 @@ class WheelEvent : public nsMouseEvent_base
         (lineOrPageDeltaX > 0 && lineOrPageDeltaY < 0)) {
       return 0; // We cannot guess the answer in this case.
     }
-    return (DeprecatedAbs(lineOrPageDeltaX) > DeprecatedAbs(lineOrPageDeltaY)) ?
+    return (Abs(lineOrPageDeltaX) > Abs(lineOrPageDeltaY)) ?
              lineOrPageDeltaX : lineOrPageDeltaY;
   }
 

diff --git a/xpfe/appshell/src/nsXULWindow.cpp b/xpfe/appshell/src/nsXULWindow.cpp
@@ -1270,7 +1270,7 @@ void nsXULWindow::StaggerPosition(int32_t &aRequestedX, int32_t &aRequestedY,
                                   int32_t aSpecWidth, int32_t aSpecHeight)
 {
   const int32_t kOffset = 22;
-  const int32_t kSlop   = 4;
+  const uint32_t kSlop  = 4;
 
   nsresult rv;
   bool     keepTrying;
@@ -1349,7 +1349,7 @@ void nsXULWindow::StaggerPosition(int32_t &aRequestedX, int32_t &aRequestedY,
           listY = NSToIntRound(listY / scale);
         }
 
-        if (DeprecatedAbs(listX - aRequestedX) <= kSlop && DeprecatedAbs(listY - aRequestedY) <= kSlop) {
+        if (Abs(listX - aRequestedX) <= kSlop && Abs(listY - aRequestedY) <= kSlop) {
           // collision! offset and start over
           if (bouncedX & 0x1)
             aRequestedX -= kOffset;