Skip to content

Commit a5de55d

Browse files
jandemjandem
committed
Bug 1389510 part 3 - Remove getProperty/setProperty hooks from ClassOps. r=evilpie
1 parent ff7f9d6 commit a5de55d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+31
-187
lines changed

‎devtools/shared/heapsnapshot/tests/gtest/DevTools.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ struct DevTools : public ::testing::Test {
7474
static const JSClassOps globalClassOps = {
7575
nullptr, nullptr, nullptr, nullptr,
7676
nullptr, nullptr, nullptr, nullptr,
77-
nullptr, nullptr, nullptr, nullptr,
77+
nullptr, nullptr,
7878
JS_GlobalObjectTraceHook
7979
};
8080
static const JSClass globalClass = {

‎dom/bindings/BindingUtils.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2048,8 +2048,6 @@ NativePropertyHooks sEmptyNativePropertyHooks = {
20482048
const js::ClassOps sBoringInterfaceObjectClassClassOps = {
20492049
nullptr, /* addProperty */
20502050
nullptr, /* delProperty */
2051-
nullptr, /* getProperty */
2052-
nullptr, /* setProperty */
20532051
nullptr, /* enumerate */
20542052
nullptr, /* newEnumerate */
20552053
nullptr, /* resolve */

‎dom/bindings/Codegen.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -476,8 +476,6 @@ def define(self):
476476
static const js::ClassOps sClassOps = {
477477
${addProperty}, /* addProperty */
478478
nullptr, /* delProperty */
479-
nullptr, /* getProperty */
480-
nullptr, /* setProperty */
481479
nullptr, /* enumerate */
482480
${newEnumerate}, /* newEnumerate */
483481
${resolve}, /* resolve */
@@ -767,8 +765,6 @@ def define(self):
767765
static const js::ClassOps sInterfaceObjectClassOps = {
768766
nullptr, /* addProperty */
769767
nullptr, /* delProperty */
770-
nullptr, /* getProperty */
771-
nullptr, /* setProperty */
772768
nullptr, /* enumerate */
773769
nullptr, /* newEnumerate */
774770
nullptr, /* resolve */

‎dom/bindings/SimpleGlobalObject.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ SimpleGlobal_moved(JSObject *obj, const JSObject *old)
5959
}
6060

6161
static const js::ClassOps SimpleGlobalClassOps = {
62-
nullptr,
63-
nullptr,
6462
nullptr,
6563
nullptr,
6664
nullptr,

‎dom/indexedDB/ActorsParent.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25043,8 +25043,6 @@ CreateIndexOp::DoDatabaseWork(DatabaseConnection* aConnection)
2504325043
static const JSClassOps sNormalJSContextGlobalClassOps = {
2504425044
/* addProperty */ nullptr,
2504525045
/* delProperty */ nullptr,
25046-
/* getProperty */ nullptr,
25047-
/* setProperty */ nullptr,
2504825046
/* enumerate */ nullptr,
2504925047
/* newEnumerate */ nullptr,
2505025048
/* resolve */ nullptr,

‎dom/plugins/base/nsJSNPRuntime.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ NPObjectMember_toPrimitive(JSContext *cx, unsigned argc, JS::Value *vp);
282282

283283
static const JSClassOps sNPObjectMemberClassOps = {
284284
nullptr, nullptr, nullptr, nullptr,
285-
nullptr, nullptr, nullptr, nullptr,
285+
nullptr, nullptr,
286286
NPObjectMember_Finalize, NPObjectMember_Call,
287287
nullptr, nullptr, NPObjectMember_Trace
288288
};

‎dom/xbl/nsXBLBinding.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ XBLEnumerate(JSContext *cx, JS::Handle<JSObject*> obj)
8686
}
8787

8888
static const JSClassOps gPrototypeJSClassOps = {
89-
nullptr, nullptr, nullptr, nullptr,
89+
nullptr, nullptr,
9090
XBLEnumerate, nullptr, nullptr,
9191
nullptr, XBLFinalize,
9292
nullptr, nullptr, nullptr, nullptr

‎js/public/Class.h‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -639,8 +639,6 @@ struct JS_STATIC_CLASS ClassOps
639639
/* Function pointer members (may be null). */
640640
JSAddPropertyOp addProperty;
641641
JSDeletePropertyOp delProperty;
642-
JSGetterOp getProperty;
643-
JSSetterOp setProperty;
644642
JSEnumerateOp enumerate;
645643
JSNewEnumerateOp newEnumerate;
646644
JSResolveOp resolve;
@@ -757,8 +755,6 @@ struct JS_STATIC_CLASS JSClassOps
757755
/* Function pointer members (may be null). */
758756
JSAddPropertyOp addProperty;
759757
JSDeletePropertyOp delProperty;
760-
JSGetterOp getProperty;
761-
JSSetterOp setProperty;
762758
JSEnumerateOp enumerate;
763759
JSNewEnumerateOp newEnumerate;
764760
JSResolveOp resolve;
@@ -983,10 +979,6 @@ static_assert(offsetof(JSClassOps, addProperty) == offsetof(ClassOps, addPropert
983979
"ClassOps and JSClassOps must be consistent");
984980
static_assert(offsetof(JSClassOps, delProperty) == offsetof(ClassOps, delProperty),
985981
"ClassOps and JSClassOps must be consistent");
986-
static_assert(offsetof(JSClassOps, getProperty) == offsetof(ClassOps, getProperty),
987-
"ClassOps and JSClassOps must be consistent");
988-
static_assert(offsetof(JSClassOps, setProperty) == offsetof(ClassOps, setProperty),
989-
"ClassOps and JSClassOps must be consistent");
990982
static_assert(offsetof(JSClassOps, enumerate) == offsetof(ClassOps, enumerate),
991983
"ClassOps and JSClassOps must be consistent");
992984
static_assert(offsetof(JSClassOps, newEnumerate) == offsetof(ClassOps, newEnumerate),

‎js/src/builtin/DataViewObject.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -929,8 +929,6 @@ DataViewObject::CreatePrototype(JSContext* cx, JSProtoKey key)
929929
static const ClassOps DataViewObjectClassOps = {
930930
nullptr, /* addProperty */
931931
nullptr, /* delProperty */
932-
nullptr, /* getProperty */
933-
nullptr, /* setProperty */
934932
nullptr, /* enumerate */
935933
nullptr, /* newEnumerate */
936934
nullptr, /* resolve */

‎js/src/builtin/Intl.cpp‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -932,8 +932,6 @@ Call(JSContext* cx, const ICUStringFunction& strFn)
932932
const ClassOps CollatorObject::classOps_ = {
933933
nullptr, /* addProperty */
934934
nullptr, /* delProperty */
935-
nullptr, /* getProperty */
936-
nullptr, /* setProperty */
937935
nullptr, /* enumerate */
938936
nullptr, /* newEnumerate */
939937
nullptr, /* resolve */
@@ -1500,8 +1498,6 @@ js::intl_isUpperCaseFirst(JSContext* cx, unsigned argc, Value* vp)
15001498
const ClassOps NumberFormatObject::classOps_ = {
15011499
nullptr, /* addProperty */
15021500
nullptr, /* delProperty */
1503-
nullptr, /* getProperty */
1504-
nullptr, /* setProperty */
15051501
nullptr, /* enumerate */
15061502
nullptr, /* newEnumerate */
15071503
nullptr, /* resolve */
@@ -2374,8 +2370,6 @@ js::intl_FormatNumber(JSContext* cx, unsigned argc, Value* vp)
23742370
const ClassOps DateTimeFormatObject::classOps_ = {
23752371
nullptr, /* addProperty */
23762372
nullptr, /* delProperty */
2377-
nullptr, /* getProperty */
2378-
nullptr, /* setProperty */
23792373
nullptr, /* enumerate */
23802374
nullptr, /* newEnumerate */
23812375
nullptr, /* resolve */
@@ -3485,8 +3479,6 @@ js::intl_FormatDateTime(JSContext* cx, unsigned argc, Value* vp)
34853479
const ClassOps PluralRulesObject::classOps_ = {
34863480
nullptr, /* addProperty */
34873481
nullptr, /* delProperty */
3488-
nullptr, /* getProperty */
3489-
nullptr, /* setProperty */
34903482
nullptr, /* enumerate */
34913483
nullptr, /* newEnumerate */
34923484
nullptr, /* resolve */

0 commit comments

Comments
 (0)