From 845f60f31f56e53702573c925b17492c6e4ef069 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sat, 24 Dec 2011 09:26:18 +0100
Subject: [PATCH] Bug 711404 - Part b: Remove xpc_qsDoubleToUint64; r=bholley

---
 dom/workers/File.cpp             |  6 ++----
 js/xpconnect/src/XPCQuickStubs.h | 11 +----------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/dom/workers/File.cpp b/dom/workers/File.cpp
index 28e1f7ca5a22..f19a4a3b1bd1 100644
--- a/dom/workers/File.cpp
+++ b/dom/workers/File.cpp
@@ -48,8 +48,6 @@
 #include "nsCOMPtr.h"
 #include "nsJSUtils.h"
 #include "nsStringGlue.h"
-#include "xpcprivate.h"
-#include "XPCQuickStubs.h"
 
 #include "Exceptions.h"
 #include "WorkerInlines.h"
@@ -208,8 +206,8 @@ private:
 
     PRUint8 optionalArgc = aArgc;
     nsCOMPtr<nsIDOMBlob> rtnBlob;
-    if (NS_FAILED(blob->MozSlice(xpc_qsDoubleToUint64(start),
-                                 xpc_qsDoubleToUint64(end),
+    if (NS_FAILED(blob->MozSlice(static_cast<PRUint64>(start),
+                                 static_cast<PRUint64>(end),
                                  contentType, optionalArgc,
                                  getter_AddRefs(rtnBlob)))) {
       ThrowFileExceptionForCode(aCx, FILE_NOT_READABLE_ERR);
diff --git a/js/xpconnect/src/XPCQuickStubs.h b/js/xpconnect/src/XPCQuickStubs.h
index 6c805d10b718..7be860355af5 100644
--- a/js/xpconnect/src/XPCQuickStubs.h
+++ b/js/xpconnect/src/XPCQuickStubs.h
@@ -698,15 +698,6 @@ xpc_qsValueToInt64(JSContext *cx,
     return true;
 }
 
-/**
- * Convert a jsdouble to PRUint64. Needed for traceable quickstubs too.
- */
-inline PRUint64
-xpc_qsDoubleToUint64(jsdouble doubleval)
-{
-    return static_cast<PRUint64>(doubleval);
-}
-
 /**
  * Convert a jsval to PRUint64. Return true on success.
  */
@@ -724,7 +715,7 @@ xpc_qsValueToUint64(JSContext *cx,
         jsdouble doubleval;
         if (!JS_ValueToNumber(cx, v, &doubleval))
             return false;
-        *result = xpc_qsDoubleToUint64(doubleval);
+        *result = static_cast<PRUint64>(doubleval);
     }
     return true;
 }