sera/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

SpiderMonkey 38 upgrade: 12/35

Browse Source 
Major update to the JSClass stubs. Based on patch by leper.
https://bugzilla.mozilla.org/show_bug.cgi?id=1103152

This was SVN commit r18666.
This commit is contained in:
Nicolas Auvray 2016-09-02 16:26:54 +00:00
parent b01300c222
commit c99ae7ca1c
4 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/gui/scripting/JSInterface_GUITypes.cpp
View File

@ -23,11 +23,10 @@
/**** GUISize ****/
JSClass JSI_GUISize::JSI_class = {
"GUISize", 0,
JS_PropertyStub, JS_DeletePropertyStub,
JS_PropertyStub, JS_StrictPropertyStub,
JS_EnumerateStub, JS_ResolveStub,
JS_ConvertStub, NULL,
NULL, NULL, JSI_GUISize::construct, NULL
nullptr, nullptr,
nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, JSI_GUISize::construct, nullptr
};
JSFunctionSpec JSI_GUISize::JSI_methods[] =
@ -132,11 +131,10 @@ bool JSI_GUISize::toString(JSContext* cx, uint argc, jsval* vp)
JSClass JSI_GUIColor::JSI_class = {
"GUIColor", 0,
JS_PropertyStub, JS_DeletePropertyStub,
JS_PropertyStub, JS_StrictPropertyStub,
JS_EnumerateStub, JS_ResolveStub,
JS_ConvertStub, NULL,
NULL, NULL, JSI_GUIColor::construct, NULL
nullptr, nullptr,
nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, JSI_GUIColor::construct, nullptr
};
JSFunctionSpec JSI_GUIColor::JSI_methods[] =
@ -202,11 +200,10 @@ bool JSI_GUIColor::toString(JSContext* cx, uint argc, jsval* vp)
JSClass JSI_GUIMouse::JSI_class = {
"GUIMouse", 0,
JS_PropertyStub, JS_DeletePropertyStub,
JS_PropertyStub, JS_StrictPropertyStub,
JS_EnumerateStub, JS_ResolveStub,
JS_ConvertStub, NULL,
NULL, NULL, JSI_GUIMouse::construct, NULL
nullptr, nullptr,
nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, JSI_GUIMouse::construct, nullptr
};
JSFunctionSpec JSI_GUIMouse::JSI_methods[] =

7
source/gui/scripting/JSInterface_IGUIObject.cpp
View File

@ -33,11 +33,10 @@
JSClass JSI_IGUIObject::JSI_class = {
"GUIObject", JSCLASS_HAS_PRIVATE,
JS_PropertyStub, JS_DeletePropertyStub,
nullptr, nullptr,
JSI_IGUIObject::getProperty, JSI_IGUIObject::setProperty,
JS_EnumerateStub, JS_ResolveStub,
JS_ConvertStub, NULL,
NULL, NULL, JSI_IGUIObject::construct, NULL
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, JSI_IGUIObject::construct, nullptr
};
JSPropertySpec JSI_IGUIObject::JSI_props[] =

6
source/scriptinterface/ScriptInterface.cpp
View File

@ -81,9 +81,9 @@ namespace
JSClass global_class = {
"global", JSCLASS_GLOBAL_FLAGS,
JS_PropertyStub, JS_DeletePropertyStub,
JS_PropertyStub, JS_StrictPropertyStub,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub,
nullptr, nullptr,
nullptr, nullptr,
nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
JS_GlobalObjectTraceHook
};

8
source/simulation2/system/InterfaceScripted.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2012 Wildfire Games.
/* Copyright (C) 2016 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -22,11 +22,7 @@
#define BEGIN_INTERFACE_WRAPPER(iname) \
JSClass class_ICmp##iname = { \
"ICmp" #iname, JSCLASS_HAS_PRIVATE, \
JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub, \
JS_EnumerateStub, JS_ResolveStub, \
JS_ConvertStub, NULL, \
NULL, NULL, NULL, NULL \
"ICmp" #iname, JSCLASS_HAS_PRIVATE \
}; \
static JSFunctionSpec methods_ICmp##iname[] = {