mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-26 03:35:33 +00:00
Bug 734668; remove canvas quickstubs. r=Ms2ger
--HG-- extra : rebase_source : ceefaf29933c58a0605d60a599fddf31b0c1b229
This commit is contained in:
Nicholas Cameron
parent
5df4e02871
commit
95b7ba0d53
@ -1,38 +0,0 @@
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef CustomQS_Canvas_h
|
||||
#define CustomQS_Canvas_h
|
||||
|
||||
#include "jsapi.h"
|
||||
|
||||
#include "mozilla/dom/ImageData.h"
|
||||
|
||||
#include "XPCQuickStubs.h"
|
||||
|
||||
static bool
|
||||
GetImageData(JSContext* cx, JS::Value& imageData,
|
||||
uint32_t* width, uint32_t* height, JS::Anchor<JSObject*>* array)
|
||||
{
|
||||
if (!imageData.isObject()) {
|
||||
return xpc_qsThrow(cx, NS_ERROR_DOM_TYPE_MISMATCH_ERR);
|
||||
}
|
||||
|
||||
nsIDOMImageData* domImageData;
|
||||
xpc_qsSelfRef imageDataRef;
|
||||
nsresult rv = xpc_qsUnwrapArg<nsIDOMImageData>(cx, imageData, &domImageData,
|
||||
&imageDataRef.ptr, &imageData);
|
||||
if (NS_FAILED(rv)) {
|
||||
return xpc_qsThrow(cx, rv);
|
||||
}
|
||||
|
||||
mozilla::dom::ImageData* concreteImageData =
|
||||
static_cast<mozilla::dom::ImageData*>(domImageData);
|
||||
*width = concreteImageData->GetWidth();
|
||||
*height = concreteImageData->GetHeight();
|
||||
array->set(concreteImageData->GetDataObject());
|
||||
return true;
|
||||
}
|
||||
|
||||
#endif // CustomQS_Canvas_h
|
||||
@ -1,302 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 40; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#include "nsError.h"
|
||||
#include "nsIDOMCanvasRenderingContext2D.h"
|
||||
#include "mozilla/CheckedInt.h"
|
||||
#include "nsMathUtils.h"
|
||||
#include "CustomQS_Canvas.h"
|
||||
|
||||
#include "jsapi.h"
|
||||
#include "jsfriendapi.h"
|
||||
|
||||
typedef NS_STDCALL_FUNCPROTO(nsresult, CanvasStyleSetterType, nsIDOMCanvasRenderingContext2D,
|
||||
SetStrokeStyle_multi, (const nsAString &, nsISupports *));
|
||||
typedef NS_STDCALL_FUNCPROTO(nsresult, CanvasStyleGetterType, nsIDOMCanvasRenderingContext2D,
|
||||
GetStrokeStyle_multi, (nsAString &, nsISupports **, int32_t *));
|
||||
|
||||
static JSBool
|
||||
Canvas2D_SetStyleHelper(JSContext *cx, JSObject *obj, jsid id, JSMutableHandleValue vp,
|
||||
CanvasStyleSetterType setfunc)
|
||||
{
|
||||
XPC_QS_ASSERT_CONTEXT_OK(cx);
|
||||
nsIDOMCanvasRenderingContext2D *self;
|
||||
xpc_qsSelfRef selfref;
|
||||
JS::AutoValueRooter tvr(cx);
|
||||
if (!xpc_qsUnwrapThis(cx, obj, &self, &selfref.ptr, tvr.jsval_addr(), nullptr))
|
||||
return JS_FALSE;
|
||||
|
||||
nsresult rv = NS_OK;
|
||||
if (JSVAL_IS_STRING(vp)) {
|
||||
xpc_qsDOMString arg0(cx, vp, vp.address(),
|
||||
xpc_qsDOMString::eDefaultNullBehavior,
|
||||
xpc_qsDOMString::eDefaultUndefinedBehavior);
|
||||
if (!arg0.IsValid())
|
||||
return JS_FALSE;
|
||||
|
||||
rv = (self->*setfunc)(arg0, nullptr);
|
||||
} else {
|
||||
nsISupports *arg0;
|
||||
xpc_qsSelfRef arg0ref;
|
||||
rv = xpc_qsUnwrapArg<nsISupports>(cx, vp, &arg0, &arg0ref.ptr, vp.address());
|
||||
if (NS_FAILED(rv)) {
|
||||
xpc_qsThrowBadSetterValue(cx, rv, JSVAL_TO_OBJECT(*tvr.jsval_addr()), id);
|
||||
return JS_FALSE;
|
||||
}
|
||||
|
||||
rv = (self->*setfunc)(NullString(), arg0);
|
||||
}
|
||||
|
||||
if (NS_FAILED(rv))
|
||||
return xpc_qsThrowGetterSetterFailed(cx, rv, JSVAL_TO_OBJECT(*tvr.jsval_addr()), id);
|
||||
|
||||
return JS_TRUE;
|
||||
}
|
||||
|
||||
static JSBool
|
||||
Canvas2D_GetStyleHelper(JSContext *cx, JSObject *obj, jsid id, JSMutableHandleValue vp,
|
||||
CanvasStyleGetterType getfunc)
|
||||
{
|
||||
XPC_QS_ASSERT_CONTEXT_OK(cx);
|
||||
nsIDOMCanvasRenderingContext2D *self;
|
||||
xpc_qsSelfRef selfref;
|
||||
XPCLazyCallContext lccx(JS_CALLER, cx, obj);
|
||||
if (!xpc_qsUnwrapThis(cx, obj, &self, &selfref.ptr, vp.address(), &lccx))
|
||||
return JS_FALSE;
|
||||
nsresult rv;
|
||||
|
||||
nsString resultString;
|
||||
nsCOMPtr<nsISupports> resultInterface;
|
||||
int32_t resultType;
|
||||
rv = (self->*getfunc)(resultString, getter_AddRefs(resultInterface), &resultType);
|
||||
if (NS_FAILED(rv))
|
||||
return xpc_qsThrowGetterSetterFailed(cx, rv, JSVAL_TO_OBJECT(vp), id);
|
||||
|
||||
switch (resultType) {
|
||||
case nsIDOMCanvasRenderingContext2D::CMG_STYLE_STRING:
|
||||
return xpc::StringToJsval(cx, resultString, vp.address());
|
||||
|
||||
case nsIDOMCanvasRenderingContext2D::CMG_STYLE_PATTERN:
|
||||
{
|
||||
qsObjectHelper helper(resultInterface,
|
||||
xpc_qsGetWrapperCache(resultInterface));
|
||||
return xpc_qsXPCOMObjectToJsval(lccx, helper,
|
||||
&NS_GET_IID(nsIDOMCanvasPattern),
|
||||
&interfaces[k_nsIDOMCanvasPattern], vp.address());
|
||||
}
|
||||
case nsIDOMCanvasRenderingContext2D::CMG_STYLE_GRADIENT:
|
||||
{
|
||||
qsObjectHelper helper(resultInterface,
|
||||
xpc_qsGetWrapperCache(resultInterface));
|
||||
return xpc_qsXPCOMObjectToJsval(lccx, helper,
|
||||
&NS_GET_IID(nsIDOMCanvasGradient),
|
||||
&interfaces[k_nsIDOMCanvasGradient], vp.address());
|
||||
}
|
||||
default:
|
||||
return xpc_qsThrowGetterSetterFailed(cx, NS_ERROR_FAILURE, JSVAL_TO_OBJECT(vp), id);
|
||||
}
|
||||
}
|
||||
|
||||
static JSBool
|
||||
nsIDOMCanvasRenderingContext2D_SetStrokeStyle(JSContext *cx, JSHandleObject obj, JSHandleId id, JSBool strict, JSMutableHandleValue vp)
|
||||
{
|
||||
return Canvas2D_SetStyleHelper(cx, obj, id, vp, &nsIDOMCanvasRenderingContext2D::SetStrokeStyle_multi);
|
||||
}
|
||||
|
||||
static JSBool
|
||||
nsIDOMCanvasRenderingContext2D_GetStrokeStyle(JSContext *cx, JSHandleObject obj, JSHandleId id, JSMutableHandleValue vp)
|
||||
{
|
||||
return Canvas2D_GetStyleHelper(cx, obj, id, vp, &nsIDOMCanvasRenderingContext2D::GetStrokeStyle_multi);
|
||||
}
|
||||
|
||||
static JSBool
|
||||
nsIDOMCanvasRenderingContext2D_SetFillStyle(JSContext *cx, JSHandleObject obj, JSHandleId id, JSBool strict, JSMutableHandleValue vp)
|
||||
{
|
||||
return Canvas2D_SetStyleHelper(cx, obj, id, vp, &nsIDOMCanvasRenderingContext2D::SetFillStyle_multi);
|
||||
}
|
||||
|
||||
static JSBool
|
||||
nsIDOMCanvasRenderingContext2D_GetFillStyle(JSContext *cx, JSHandleObject obj, JSHandleId id, JSMutableHandleValue vp)
|
||||
{
|
||||
return Canvas2D_GetStyleHelper(cx, obj, id, vp, &nsIDOMCanvasRenderingContext2D::GetFillStyle_multi);
|
||||
}
|
||||
|
||||
static bool
|
||||
CreateImageData(JSContext* cx, JSObject* obj, uint32_t w, uint32_t h, jsval* vp)
|
||||
{
|
||||
using mozilla::CheckedInt;
|
||||
|
||||
if (w == 0)
|
||||
w = 1;
|
||||
if (h == 0)
|
||||
h = 1;
|
||||
|
||||
CheckedInt<uint32_t> len = CheckedInt<uint32_t>(w) * h * 4;
|
||||
if (!len.isValid()) {
|
||||
return xpc_qsThrow(cx, NS_ERROR_DOM_INDEX_SIZE_ERR);
|
||||
}
|
||||
|
||||
// Create the fast typed array; it's initialized to 0 by default.
|
||||
JSObject* darray = JS_NewUint8ClampedArray(cx, len.value());
|
||||
JS::AutoObjectRooter rd(cx, darray);
|
||||
if (!darray) {
|
||||
return false;
|
||||
}
|
||||
|
||||
XPCLazyCallContext lccx(JS_CALLER, cx, obj);
|
||||
const nsIID *iid = &NS_GET_IID(nsIDOMImageData);
|
||||
nsRefPtr<mozilla::dom::ImageData> imageData =
|
||||
new mozilla::dom::ImageData(w, h, *darray);
|
||||
qsObjectHelper helper(imageData, NULL);
|
||||
return xpc_qsXPCOMObjectToJsval(lccx, helper, iid,
|
||||
&interfaces[k_nsIDOMImageData], vp);
|
||||
}
|
||||
|
||||
static JSBool
|
||||
nsIDOMCanvasRenderingContext2D_CreateImageData(JSContext *cx, unsigned argc, jsval *vp)
|
||||
{
|
||||
XPC_QS_ASSERT_CONTEXT_OK(cx);
|
||||
|
||||
JSObject* obj = JS_THIS_OBJECT(cx, vp);
|
||||
if (!obj) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (argc < 1)
|
||||
return xpc_qsThrow(cx, NS_ERROR_XPC_NOT_ENOUGH_ARGS);
|
||||
|
||||
jsval *argv = JS_ARGV(cx, vp);
|
||||
|
||||
if (argc == 1) {
|
||||
uint32_t data_width, data_height;
|
||||
JS::Anchor<JSObject*> darray;
|
||||
if (!GetImageData(cx, argv[0], &data_width, &data_height, &darray)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return CreateImageData(cx, obj, data_width, data_height, vp);
|
||||
}
|
||||
|
||||
double width, height;
|
||||
if (!JS_ValueToNumber(cx, argv[0], &width) ||
|
||||
!JS_ValueToNumber(cx, argv[1], &height))
|
||||
return false;
|
||||
|
||||
if (!NS_finite(width) || !NS_finite(height))
|
||||
return xpc_qsThrow(cx, NS_ERROR_DOM_NOT_SUPPORTED_ERR);
|
||||
|
||||
if (!width || !height)
|
||||
return xpc_qsThrow(cx, NS_ERROR_DOM_INDEX_SIZE_ERR);
|
||||
|
||||
int32_t wi = JS_DoubleToInt32(width);
|
||||
int32_t hi = JS_DoubleToInt32(height);
|
||||
|
||||
uint32_t w = NS_ABS(wi);
|
||||
uint32_t h = NS_ABS(hi);
|
||||
return CreateImageData(cx, obj, w, h, vp);
|
||||
}
|
||||
|
||||
static JSBool
|
||||
nsIDOMCanvasRenderingContext2D_PutImageData(JSContext *cx, unsigned argc, jsval *vp)
|
||||
{
|
||||
XPC_QS_ASSERT_CONTEXT_OK(cx);
|
||||
|
||||
JSObject *obj = JS_THIS_OBJECT(cx, vp);
|
||||
if (!obj)
|
||||
return JS_FALSE;
|
||||
|
||||
nsresult rv;
|
||||
|
||||
nsIDOMCanvasRenderingContext2D *self;
|
||||
xpc_qsSelfRef selfref;
|
||||
JS::AutoValueRooter tvr(cx);
|
||||
if (!xpc_qsUnwrapThis(cx, obj, &self, &selfref.ptr, tvr.jsval_addr(), nullptr))
|
||||
return JS_FALSE;
|
||||
|
||||
if (argc < 3)
|
||||
return xpc_qsThrow(cx, NS_ERROR_XPC_NOT_ENOUGH_ARGS);
|
||||
|
||||
jsval *argv = JS_ARGV(cx, vp);
|
||||
|
||||
uint32_t w, h;
|
||||
JS::Anchor<JSObject*> darray;
|
||||
if (!GetImageData(cx, argv[0], &w, &h, &darray)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
double xd, yd;
|
||||
if (!JS_ValueToNumber(cx, argv[1], &xd) ||
|
||||
!JS_ValueToNumber(cx, argv[2], &yd)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!NS_finite(xd) || !NS_finite(yd)) {
|
||||
return xpc_qsThrow(cx, NS_ERROR_DOM_NOT_SUPPORTED_ERR);
|
||||
}
|
||||
|
||||
int32_t x = JS_DoubleToInt32(xd);
|
||||
int32_t y = JS_DoubleToInt32(yd);
|
||||
|
||||
// the optional dirty rect
|
||||
bool hasDirtyRect = false;
|
||||
int32_t dirtyX = 0,
|
||||
dirtyY = 0,
|
||||
dirtyWidth = w,
|
||||
dirtyHeight = h;
|
||||
|
||||
if (argc >= 7) {
|
||||
double dx, dy, dw, dh;
|
||||
if (!JS_ValueToNumber(cx, argv[3], &dx) ||
|
||||
!JS_ValueToNumber(cx, argv[4], &dy) ||
|
||||
!JS_ValueToNumber(cx, argv[5], &dw) ||
|
||||
!JS_ValueToNumber(cx, argv[6], &dh)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!NS_finite(dx) || !NS_finite(dy) ||
|
||||
!NS_finite(dw) || !NS_finite(dh)) {
|
||||
return xpc_qsThrow(cx, NS_ERROR_DOM_NOT_SUPPORTED_ERR);
|
||||
}
|
||||
|
||||
dirtyX = JS_DoubleToInt32(dx);
|
||||
dirtyY = JS_DoubleToInt32(dy);
|
||||
dirtyWidth = JS_DoubleToInt32(dw);
|
||||
dirtyHeight = JS_DoubleToInt32(dh);
|
||||
|
||||
hasDirtyRect = true;
|
||||
}
|
||||
|
||||
JS::AutoValueRooter tsrc_tvr(cx);
|
||||
|
||||
JSObject * tsrc = NULL;
|
||||
if (JS_IsInt8Array(darray.get(), cx) ||
|
||||
JS_IsUint8Array(darray.get(), cx) ||
|
||||
JS_IsUint8ClampedArray(darray.get(), cx))
|
||||
{
|
||||
tsrc = darray.get();
|
||||
} else if (JS_IsTypedArrayObject(darray.get(), cx) || JS_IsArrayObject(cx, darray.get())) {
|
||||
// ugh, this isn't a uint8 typed array, someone made their own object; convert it to a typed array
|
||||
JSObject *nobj = JS_NewUint8ClampedArrayFromArray(cx, darray.get());
|
||||
if (!nobj)
|
||||
return JS_FALSE;
|
||||
|
||||
*tsrc_tvr.jsval_addr() = OBJECT_TO_JSVAL(nobj);
|
||||
tsrc = nobj;
|
||||
} else {
|
||||
// yeah, no.
|
||||
return xpc_qsThrow(cx, NS_ERROR_DOM_TYPE_MISMATCH_ERR);
|
||||
}
|
||||
|
||||
// make the call
|
||||
MOZ_ASSERT(JS_IsTypedArrayObject(tsrc, cx));
|
||||
uint8_t* data = reinterpret_cast<uint8_t*>(JS_GetArrayBufferViewData(tsrc, cx));
|
||||
uint32_t byteLength = JS_GetTypedArrayByteLength(tsrc, cx);
|
||||
rv = self->PutImageData_explicit(x, y, w, h, data, byteLength, hasDirtyRect, dirtyX, dirtyY, dirtyWidth, dirtyHeight);
|
||||
if (NS_FAILED(rv))
|
||||
return xpc_qsThrowMethodFailed(cx, rv, vp);
|
||||
|
||||
*vp = JSVAL_VOID;
|
||||
return JS_TRUE;
|
||||
}
|
||||
@ -17,8 +17,6 @@ LIBRARY_NAME = gkconcvs_s
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
EXPORTS = \
|
||||
CustomQS_Canvas.h \
|
||||
CustomQS_Canvas2D.h \
|
||||
WebGLContext.h \
|
||||
WebGLElementArrayCache.h \
|
||||
WebGLExtensions.h \
|
||||
|
||||
@ -57,8 +57,7 @@ members = [
|
||||
|
||||
# dom/interfaces/canvas
|
||||
#
|
||||
# nsIDOMCanvasRenderingContext2D and friends
|
||||
'nsIDOMCanvasRenderingContext2D.*',
|
||||
# canvas friends
|
||||
'nsIDOMTextMetrics.*',
|
||||
'nsIDOMCanvasGradient.*',
|
||||
'nsIDOMCanvasPattern.*',
|
||||
@ -489,10 +488,6 @@ customIncludes = [
|
||||
'mozilla/dom/ImageData.h'
|
||||
]
|
||||
|
||||
customQuickStubs = [
|
||||
'CustomQS_Canvas2D.h'
|
||||
]
|
||||
|
||||
customReturnInterfaces = [
|
||||
'nsIDOMCanvasPattern',
|
||||
'nsIDOMCanvasGradient',
|
||||
@ -649,10 +644,6 @@ customMethodCalls = {
|
||||
'nsIDOMStorage_Clear': {
|
||||
'code': nsIDOMStorage_Clear_customMethodCallCode
|
||||
},
|
||||
'nsIDOMCanvasRenderingContext2D_StrokeStyle': { 'skipgen': True },
|
||||
'nsIDOMCanvasRenderingContext2D_StrokeStyle': { 'skipgen': True },
|
||||
'nsIDOMCanvasRenderingContext2D_FillStyle': { 'skipgen': True },
|
||||
'nsIDOMCanvasRenderingContext2D_FillStyle': { 'skipgen': True },
|
||||
'nsIDOMCSS2Properties_': {
|
||||
'thisType': 'nsICSSDeclaration',
|
||||
'additionalArguments': 'const nsCSSProperty prop',
|
||||
@ -971,12 +962,6 @@ customMethodCalls = {
|
||||
'thisType' : 'nsIDOMWindow',
|
||||
'unwrapThisFailureFatal' : False
|
||||
},
|
||||
# Canvas 2D
|
||||
'nsIDOMCanvasRenderingContext2D_CreateImageData': CUSTOM_QS,
|
||||
'nsIDOMCanvasRenderingContext2D_PutImageData': CUSTOM_QS,
|
||||
# Nasty hack to make the ordering of |arc| and |arcTo| correct.
|
||||
# |arc| is not traceable because it has an optional argument.
|
||||
'nsIDOMCanvasRenderingContext2D_ArcTo' : { 'traceable' : False },
|
||||
|
||||
'nsIDOMImageData_GetWidth': {
|
||||
'thisType': 'nsIDOMImageData',
|
||||
|
||||
Loading…
Reference in New Issue
Block a user