wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1112774 - Remove JS_DoubleTo{Ui,I}nt32 in favor of JS::To{Ui,I}nt32. r=jorendorff

Browse Source 
--HG--
extra : rebase_source : 0f526faad2330aea9b8738d476aed5ce9aefde1e
This commit is contained in:
Jeff Walden 2015-01-07 10:06:03 -06:00
parent d2d785f69e
commit ca6eb3b2e6
3 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dom/canvas/CanvasRenderingContext2D.cpp
View File

@ -68,6 +68,7 @@
#include "jsapi.h" #include "jsapi.h"
#include "jsfriendapi.h" #include "jsfriendapi.h"
#include "js/Conversions.h"
#include "mozilla/Alignment.h" #include "mozilla/Alignment.h"
#include "mozilla/Assertions.h" #include "mozilla/Assertions.h"
@ -4820,10 +4821,10 @@ CanvasRenderingContext2D::GetImageData(JSContext* aCx, double aSx,
return nullptr; return nullptr;
} }
int32_t x = JS_DoubleToInt32(aSx); int32_t x = JS::ToInt32(aSx);
int32_t y = JS_DoubleToInt32(aSy); int32_t y = JS::ToInt32(aSy);
int32_t wi = JS_DoubleToInt32(aSw); int32_t wi = JS::ToInt32(aSw);
int32_t hi = JS_DoubleToInt32(aSh); int32_t hi = JS::ToInt32(aSh);
// Handle negative width and height by flipping the rectangle over in the // Handle negative width and height by flipping the rectangle over in the
// relevant direction. // relevant direction.
@ -5016,7 +5017,7 @@ CanvasRenderingContext2D::PutImageData(ImageData& imageData, double dx,
DebugOnly<bool> inited = arr.Init(imageData.GetDataObject()); DebugOnly<bool> inited = arr.Init(imageData.GetDataObject());
MOZ_ASSERT(inited); MOZ_ASSERT(inited);
error = PutImageData_explicit(JS_DoubleToInt32(dx), JS_DoubleToInt32(dy), error = PutImageData_explicit(JS::ToInt32(dx), JS::ToInt32(dy),
imageData.Width(), imageData.Height(), imageData.Width(), imageData.Height(),
&arr, false, 0, 0, 0, 0); &arr, false, 0, 0, 0, 0);
} }
@ -5032,13 +5033,13 @@ CanvasRenderingContext2D::PutImageData(ImageData& imageData, double dx,
DebugOnly<bool> inited = arr.Init(imageData.GetDataObject()); DebugOnly<bool> inited = arr.Init(imageData.GetDataObject());
MOZ_ASSERT(inited); MOZ_ASSERT(inited);
error = PutImageData_explicit(JS_DoubleToInt32(dx), JS_DoubleToInt32(dy), error = PutImageData_explicit(JS::ToInt32(dx), JS::ToInt32(dy),
imageData.Width(), imageData.Height(), imageData.Width(), imageData.Height(),
&arr, true, &arr, true,
JS_DoubleToInt32(dirtyX), JS::ToInt32(dirtyX),
JS_DoubleToInt32(dirtyY), JS::ToInt32(dirtyY),
JS_DoubleToInt32(dirtyWidth), JS::ToInt32(dirtyWidth),
JS_DoubleToInt32(dirtyHeight)); JS::ToInt32(dirtyHeight));
} }
// void putImageData (in ImageData d, in float x, in float y); // void putImageData (in ImageData d, in float x, in float y);
@ -5206,8 +5207,8 @@ CanvasRenderingContext2D::CreateImageData(JSContext* cx, double sw,
return nullptr; return nullptr;
} }
int32_t wi = JS_DoubleToInt32(sw); int32_t wi = JS::ToInt32(sw);
int32_t hi = JS_DoubleToInt32(sh); int32_t hi = JS::ToInt32(sh);
uint32_t w = Abs(wi); uint32_t w = Abs(wi);
uint32_t h = Abs(hi); uint32_t h = Abs(hi);

12
js/src/jsapi.cpp
View File

@ -452,18 +452,6 @@ JS_DoubleIsInt32(double d, int32_t *ip)
return mozilla::NumberIsInt32(d, ip); return mozilla::NumberIsInt32(d, ip);
} }
JS_PUBLIC_API(int32_t)
JS_DoubleToInt32(double d)
{
return ToInt32(d);
}
JS_PUBLIC_API(uint32_t)
JS_DoubleToUint32(double d)
{
return ToUint32(d);
}
JS_PUBLIC_API(JSType) JS_PUBLIC_API(JSType)
JS_TypeOfValue(JSContext *cx, HandleValue value) JS_TypeOfValue(JSContext *cx, HandleValue value)
{ {

6
js/src/jsapi.h
View File

@ -1099,12 +1099,6 @@ JS_ValueToSource(JSContext *cx, JS::Handle<JS::Value> v);
extern JS_PUBLIC_API(bool) extern JS_PUBLIC_API(bool)
JS_DoubleIsInt32(double d, int32_t *ip); JS_DoubleIsInt32(double d, int32_t *ip);
extern JS_PUBLIC_API(int32_t)
JS_DoubleToInt32(double d);
extern JS_PUBLIC_API(uint32_t)
JS_DoubleToUint32(double d);
extern JS_PUBLIC_API(JSType) extern JS_PUBLIC_API(JSType)
JS_TypeOfValue(JSContext *cx, JS::Handle<JS::Value> v); JS_TypeOfValue(JSContext *cx, JS::Handle<JS::Value> v);