Attachment #509033 for bug #537873

Attachment #509033: Add 'strict' argument to setters defined throughout Firefox. for bug #537873

View | Details | Raw Unified | Return to bug 537873
Collapse All | Expand All

(-)a/content/canvas/src/CustomQS_Canvas2D.h (-2 / +2 lines)

Line	Link Here

Lines 130-136 Canvas2D_GetStyleHelper(JSContext *cx, J	Link Here

130

131

132

static JSBool

132

static JSBool

133

nsIDOMCanvasRenderingContext2D_SetStrokeStyle(JSContext *cx, JSObject *obj, jsid id, jsval *vp)

133

nsIDOMCanvasRenderingContext2D_SetStrokeStyle(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp)

134

135

    return Canvas2D_SetStyleHelper(cx, obj, id, vp, &nsIDOMCanvasRenderingContext2D::SetStrokeStyle_multi);

135

    return Canvas2D_SetStyleHelper(cx, obj, id, vp, &nsIDOMCanvasRenderingContext2D::SetStrokeStyle_multi);

136

Lines 142-148 nsIDOMCanvasRenderingContext2D_GetStroke	Link Here

142

143

144

static JSBool

144

static JSBool

145

nsIDOMCanvasRenderingContext2D_SetFillStyle(JSContext *cx, JSObject *obj, jsid id, jsval *vp)

145

nsIDOMCanvasRenderingContext2D_SetFillStyle(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp)

146

147

    return Canvas2D_SetStyleHelper(cx, obj, id, vp, &nsIDOMCanvasRenderingContext2D::SetFillStyle_multi);

147

    return Canvas2D_SetStyleHelper(cx, obj, id, vp, &nsIDOMCanvasRenderingContext2D::SetFillStyle_multi);

148

(-)a/content/xbl/src/nsXBLBinding.cpp (-1 / +2 lines)

Line	Link Here

Lines 233-239 nsXBLJSClass::nsXBLJSClass(const nsAFlat	Link Here

233

    JSCLASS_NEW_RESOLVE | JSCLASS_NEW_RESOLVE_GETS_START |

233

    JSCLASS_NEW_RESOLVE | JSCLASS_NEW_RESOLVE_GETS_START |

234

    // Our one reserved slot holds the relevant nsXBLPrototypeBinding

234

    // Our one reserved slot holds the relevant nsXBLPrototypeBinding

235

    JSCLASS_HAS_RESERVED_SLOTS(1);

235

    JSCLASS_HAS_RESERVED_SLOTS(1);

236

  addProperty = delProperty = setProperty = getProperty = ::JS_PropertyStub;

236

  addProperty = delProperty = getProperty = ::JS_PropertyStub;

237

  setProperty = ::JS_StrictPropertyStub;

237

  enumerate = ::JS_EnumerateStub;

238

  enumerate = ::JS_EnumerateStub;

238

  resolve = (JSResolveOp)XBLResolve;

239

  resolve = (JSResolveOp)XBLResolve;

239

  convert = ::JS_ConvertStub;

240

  convert = ::JS_ConvertStub;

(-)a/content/xbl/src/nsXBLDocumentInfo.cpp (-1 / +1 lines)

Line	Link Here

Lines 138-144 nsXBLDocGlobalObject_getProperty(JSConte	Link Here

138

139

static JSBool

139

static JSBool

140

nsXBLDocGlobalObject_setProperty(JSContext *cx, JSObject *obj,

140

nsXBLDocGlobalObject_setProperty(JSContext *cx, JSObject *obj,

141

                                 jsid id, jsval *vp)

141

                                 jsid id, JSBool strict, jsval *vp)

142

143

  return nsXBLDocGlobalObject::

143

  return nsXBLDocGlobalObject::

144

    doCheckAccess(cx, obj, id, nsIXPCSecurityManager::ACCESS_SET_PROPERTY);

144

    doCheckAccess(cx, obj, id, nsIXPCSecurityManager::ACCESS_SET_PROPERTY);

(-)a/content/xbl/src/nsXBLProtoImplProperty.cpp (-1 / +1 lines)

Line	Link Here

Lines 195-201 nsXBLProtoImplProperty::InstallMember(ns	Link Here

195

                               reinterpret_cast<const jschar*>(mName),

195

                               reinterpret_cast<const jschar*>(mName),

196

                               name.Length(), JSVAL_VOID,

196

                               name.Length(), JSVAL_VOID,

197

                               JS_DATA_TO_FUNC_PTR(JSPropertyOp, getter),

197

                               JS_DATA_TO_FUNC_PTR(JSPropertyOp, getter),

198

                               JS_DATA_TO_FUNC_PTR(JSPropertyOp, setter),

198

                               JS_DATA_TO_FUNC_PTR(JSStrictPropertyOp, setter),

199

                               mJSAttributes))

199

                               mJSAttributes))

200

      return NS_ERROR_OUT_OF_MEMORY;

200

      return NS_ERROR_OUT_OF_MEMORY;

201

(-)a/content/xul/document/src/nsXULPrototypeDocument.cpp (-1 / +1 lines)

Line	Link Here

Lines 144-150 nsXULPDGlobalObject_resolve(JSContext *c	Link Here

144

JSClass nsXULPDGlobalObject::gSharedGlobalClass = {

144

JSClass nsXULPDGlobalObject::gSharedGlobalClass = {

145

    "nsXULPrototypeScript compilation scope",

145

    "nsXULPrototypeScript compilation scope",

146

    JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS | JSCLASS_GLOBAL_FLAGS,

146

    JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS | JSCLASS_GLOBAL_FLAGS,

147

    JS_PropertyStub,  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,

147

    JS_PropertyStub,  JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,

148

    JS_EnumerateStub, nsXULPDGlobalObject_resolve,  JS_ConvertStub,

148

    JS_EnumerateStub, nsXULPDGlobalObject_resolve,  JS_ConvertStub,

149

    nsXULPDGlobalObject_finalize

149

    nsXULPDGlobalObject_finalize

150

};

150

};






static JSClass sDOMConstructorProtoClass = {
  "DOM Constructor.prototype", 0,
  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
  JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, nsnull
};


static JSClass sGlobalScopePolluterClass = {
  "Global Scope Polluter",
  JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS | JSCLASS_NEW_RESOLVE,
  nsWindowSH::SecurityCheckOnAddDelProp,
  nsWindowSH::SecurityCheckOnAddDelProp,
  nsWindowSH::GlobalScopePolluterGetProperty,
  nsWindowSH::SecurityCheckOnSetProp,
  JS_EnumerateStub,


// static
JSBool
nsWindowSH::SecurityCheckOnAddDelProp(JSContext *cx, JSObject *obj, jsid id,
                                      jsval *vp)
{
  // Someone is accessing a element by referencing its name/id in the
  // global scope, do a security check to make sure that's ok.

  return NS_SUCCEEDED(rv);
}

// static
JSBool
nsWindowSH::SecurityCheckOnSetProp(JSContext *cx, JSObject *obj, jsid id, JSBool strict,
                                   jsval *vp)
{
  return SecurityCheckOnAddDelProp(cx, obj, id, vp);
}

static nsHTMLDocument*
GetDocument(JSContext *cx, JSObject *obj)
{

      JSAutoRequest ar(cx);

      if (!::JS_DefinePropertyById(cx, obj, id, JSVAL_VOID, JS_PropertyStub,
                                   JS_StrictPropertyStub, JSPROP_ENUMERATE)) {
        return NS_ERROR_FAILURE;
      }
      *objp = obj;

      if ((!(flags & JSRESOLVE_QUALIFIED) &&
           !js_CheckUndeclaredVarAssignment(cx, str)) ||
          !::JS_DefinePropertyById(cx, obj, id, JSVAL_VOID, JS_PropertyStub,
                                   JS_StrictPropertyStub, JSPROP_ENUMERATE)) {
        *_retval = JS_FALSE;

        return NS_OK;

                               reinterpret_cast<const jschar *>
                                               (doc_str.get()),
                               doc_str.Length(), OBJECT_TO_JSVAL(obj),
                               JS_PropertyStub, JS_StrictPropertyStub,
                               JSPROP_READONLY | JSPROP_ENUMERATE)) {
      return NS_ERROR_FAILURE;
    }

  JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS | JSCLASS_NEW_RESOLVE |
  JSCLASS_HAS_RESERVED_SLOTS(1),
  JS_PropertyStub, JS_PropertyStub, nsHTMLDocumentSH::DocumentAllGetProperty,
  JS_StrictPropertyStub, JS_EnumerateStub,
  (JSResolveOp)nsHTMLDocumentSH::DocumentAllNewResolve, JS_ConvertStub,
  nsHTMLDocumentSH::ReleaseDocument, nsnull, nsnull,
  nsHTMLDocumentSH::CallToGetPropMapper

  "HTML document.all helper class", JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE,
  JS_PropertyStub, JS_PropertyStub,
  nsHTMLDocumentSH::DocumentAllHelperGetProperty,
  JS_StrictPropertyStub, JS_EnumerateStub,
  (JSResolveOp)nsHTMLDocumentSH::DocumentAllHelperNewResolve, JS_ConvertStub,
  nsnull
};

static JSClass sHTMLDocumentAllTagsClass = {
  "HTML document.all.tags class",
  JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE | JSCLASS_PRIVATE_IS_NSISUPPORTS,
  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
  JS_EnumerateStub, (JSResolveOp)nsHTMLDocumentSH::DocumentAllTagsNewResolve,
  JS_ConvertStub, nsHTMLDocumentSH::ReleaseDocument, nsnull, nsnull,
  nsHTMLDocumentSH::CallToGetPropMapper

(-)a/dom/base/nsDOMClassInfo.h (-1 / +3 lines)

Line	Link Here

Lines 576-583 public:	Link Here

576

                                              JSObject **objp);

576

                                              JSObject **objp);

577

  static JSBool GlobalScopePolluterGetProperty(JSContext *cx, JSObject *obj,

577

  static JSBool GlobalScopePolluterGetProperty(JSContext *cx, JSObject *obj,

578

                                               jsid id, jsval *vp);

578

                                               jsid id, jsval *vp);

579

  static JSBool SecurityCheckOnAddDelProp(JSContext *cx, JSObject *obj, jsid id,

580

                                          jsval *vp);

579

  static JSBool SecurityCheckOnSetProp(JSContext *cx, JSObject *obj, jsid id,

581

  static JSBool SecurityCheckOnSetProp(JSContext *cx, JSObject *obj, jsid id,

580

                                       jsval *vp);

582

                                       JSBool strict, jsval *vp);

581

  static void InvalidateGlobalScopePolluter(JSContext *cx, JSObject *obj);

583

  static void InvalidateGlobalScopePolluter(JSContext *cx, JSObject *obj);

582

  static nsresult InstallGlobalScopePolluter(JSContext *cx, JSObject *obj,

584

  static nsresult InstallGlobalScopePolluter(JSContext *cx, JSObject *obj,

583

                                             nsIHTMLDocument *doc);

585

                                             nsIHTMLDocument *doc);

(-)a/dom/base/nsGlobalWindow.cpp (-1 / +1 lines)

Line	Link Here

Lines 2100-2106 nsGlobalWindow::SetNewDocument(nsIDocume	Link Here

2100

    } else {

2100

    } else {

2101

      if (!JS_DefineProperty(cx, newInnerWindow->mJSObject, "window",

2101

      if (!JS_DefineProperty(cx, newInnerWindow->mJSObject, "window",

2102

                             OBJECT_TO_JSVAL(mJSObject),

2102

                             OBJECT_TO_JSVAL(mJSObject),

2103

                             JS_PropertyStub, JS_PropertyStub,

2103

                             JS_PropertyStub, JS_StrictPropertyStub,

2104

                             JSPROP_ENUMERATE | JSPROP_READONLY | JSPROP_PERMANENT)) {

2104

                             JSPROP_ENUMERATE | JSPROP_READONLY | JSPROP_PERMANENT)) {

2105

        NS_ERROR("can't create the 'window' property");

2105

        NS_ERROR("can't create the 'window' property");

2106

        return NS_ERROR_FAILURE;

2106

        return NS_ERROR_FAILURE;

(-)a/dom/base/nsJSEnvironment.cpp (-1 / +1 lines)

Line	Link Here

Lines 3203-3209 nsJSContext::ClearScope(void *aGlobalObj	Link Here

3203

3204

    if (window != JSVAL_VOID) {

3204

    if (window != JSVAL_VOID) {

3205

      if (!JS_DefineProperty(mContext, obj, "window", window,

3205

      if (!JS_DefineProperty(mContext, obj, "window", window,

3206

                             JS_PropertyStub, JS_PropertyStub,

3206

                             JS_PropertyStub, JS_StrictPropertyStub,

3207

                             JSPROP_ENUMERATE | JSPROP_READONLY |

3207

                             JSPROP_ENUMERATE | JSPROP_READONLY |

3208

                             JSPROP_PERMANENT)) {

3208

                             JSPROP_PERMANENT)) {

3209

        JS_ClearPendingException(mContext);

3209

        JS_ClearPendingException(mContext);

(-)a/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp (-1 / +1 lines)

Line	Link Here

Lines 108-114 static JSObject *autoconfig_glob;	Link Here

108

109

static JSClass global_class = {

109

static JSClass global_class = {

110

    "autoconfig_global", JSCLASS_GLOBAL_FLAGS,

110

    "autoconfig_global", JSCLASS_GLOBAL_FLAGS,

111

    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,

111

    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_StrictPropertyStub,

112

    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   nsnull

112

    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   nsnull

113

};

113

};

114

(-)a/js/ipc/ObjectWrapperChild.cpp (-1 / +1 lines)

Line	Link Here

Lines 429-435 static const JSClass sCPOW_NewEnumerateS	Link Here

429

    JSCLASS_HAS_PRIVATE |

429

    JSCLASS_HAS_PRIVATE |

430

    JSCLASS_HAS_RESERVED_SLOTS(sNumNewEnumerateStateSlots),

430

    JSCLASS_HAS_RESERVED_SLOTS(sNumNewEnumerateStateSlots),

431

    JS_PropertyStub,  JS_PropertyStub,

431

    JS_PropertyStub,  JS_PropertyStub,

432

    JS_PropertyStub,  JS_PropertyStub,

432

    JS_PropertyStub,  JS_StrictPropertyStub,

433

    JS_EnumerateStub, JS_ResolveStub,

433

    JS_EnumerateStub, JS_ResolveStub,

434

    JS_ConvertStub,   CPOW_NewEnumerateState_Finalize,

434

    JS_ConvertStub,   CPOW_NewEnumerateState_Finalize,

435

    JSCLASS_NO_OPTIONAL_MEMBERS

435

    JSCLASS_NO_OPTIONAL_MEMBERS

(-)a/js/ipc/ObjectWrapperParent.cpp (-3 / +3 lines)

Line	Link Here

Lines 177-183 const js::Class ObjectWrapperParent::sCP	Link Here

177

      JS_VALUEIFY(js::PropertyOp, ObjectWrapperParent::CPOW_AddProperty),

177

      JS_VALUEIFY(js::PropertyOp, ObjectWrapperParent::CPOW_AddProperty),

178

      JS_VALUEIFY(js::PropertyOp, ObjectWrapperParent::CPOW_DelProperty),

178

      JS_VALUEIFY(js::PropertyOp, ObjectWrapperParent::CPOW_DelProperty),

179

      JS_VALUEIFY(js::PropertyOp, ObjectWrapperParent::CPOW_GetProperty),

179

      JS_VALUEIFY(js::PropertyOp, ObjectWrapperParent::CPOW_GetProperty),

180

      JS_VALUEIFY(js::PropertyOp, ObjectWrapperParent::CPOW_SetProperty),

180

      JS_VALUEIFY(js::StrictPropertyOp, ObjectWrapperParent::CPOW_SetProperty),

181

      (JSEnumerateOp) ObjectWrapperParent::CPOW_NewEnumerate,

181

      (JSEnumerateOp) ObjectWrapperParent::CPOW_NewEnumerate,

182

      (JSResolveOp) ObjectWrapperParent::CPOW_NewResolve,

182

      (JSResolveOp) ObjectWrapperParent::CPOW_NewResolve,

183

      JS_VALUEIFY(js::ConvertOp, ObjectWrapperParent::CPOW_Convert),

183

      JS_VALUEIFY(js::ConvertOp, ObjectWrapperParent::CPOW_Convert),

Lines 450-457 ObjectWrapperParent::CPOW_GetProperty(JS	Link Here

450

451

452

/*static*/ JSBool

452

/*static*/ JSBool

453

ObjectWrapperParent::CPOW_SetProperty(JSContext *cx, JSObject *obj, jsid id,

453

ObjectWrapperParent::CPOW_SetProperty(JSContext *cx, JSObject *obj, jsid id,

454

                                      jsval *vp)

454

                                      JSBool strict, jsval *vp)

455

456

    CPOW_LOG(("Calling CPOW_SetProperty (%s)...",

456

    CPOW_LOG(("Calling CPOW_SetProperty (%s)...",

457

              JSVAL_TO_CSTR(cx, id)));

457

              JSVAL_TO_CSTR(cx, id)));

(-)a/js/ipc/ObjectWrapperParent.h (-1 / +1 lines)

Line	Link Here

Lines 98-104 private:	Link Here

    CPOW_GetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp);

    CPOW_GetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp);

100

    static JSBool

100

    static JSBool

101

    CPOW_SetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp);

101

    CPOW_SetProperty(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp);

102

103

    JSBool NewEnumerateInit(JSContext* cx, jsval* statep, jsid* idp);

103

    JSBool NewEnumerateInit(JSContext* cx, jsval* statep, jsid* idp);

104

    JSBool NewEnumerateNext(JSContext* cx, jsval* statep, jsid* idp);

104

    JSBool NewEnumerateNext(JSContext* cx, jsval* statep, jsid* idp);

(-)a/js/jetpack/Handle.h (-2 / +2 lines)

Line	Link Here

Lines 249-255 private:	Link Here

249

250

251

  static JSBool

251

  static JSBool

252

  SetIsRooted(JSContext* cx, JSObject* obj, jsid, jsval* vp) {

252

  SetIsRooted(JSContext* cx, JSObject* obj, jsid, JSBool strict, jsval* vp) {

253

    Handle* self = Unwrap(cx, obj);

253

    Handle* self = Unwrap(cx, obj);

254

    JSBool v;

254

    JSBool v;

255

    if (!JS_ValueToBoolean(cx, *vp, &v))

255

    if (!JS_ValueToBoolean(cx, *vp, &v))

Lines 330-336 const JSClass	Link Here

330

Handle<BaseType>::sHandle_JSClass = {

330

Handle<BaseType>::sHandle_JSClass = {

331

  "IPDL Handle", JSCLASS_HAS_PRIVATE,

331

  "IPDL Handle", JSCLASS_HAS_PRIVATE,

332

  JS_PropertyStub, JS_PropertyStub,

332

  JS_PropertyStub, JS_PropertyStub,

333

  JS_PropertyStub, JS_PropertyStub,

333

  JS_PropertyStub, JS_StrictPropertyStub,

334

  JS_EnumerateStub, JS_ResolveStub,

334

  JS_EnumerateStub, JS_ResolveStub,

335

  JS_ConvertStub, Handle::Finalize,

335

  JS_ConvertStub, Handle::Finalize,

336

  JSCLASS_NO_OPTIONAL_MEMBERS

336

  JSCLASS_NO_OPTIONAL_MEMBERS

(-)a/js/jetpack/JetpackChild.cpp (-1 / +1 lines)

Line	Link Here

Lines 86-92 JetpackChild::sImplMethods[] = {	Link Here

const JSClass

const JSClass

JetpackChild::sGlobalClass = {

JetpackChild::sGlobalClass = {

  "JetpackChild::sGlobalClass", JSCLASS_GLOBAL_FLAGS,

  "JetpackChild::sGlobalClass", JSCLASS_GLOBAL_FLAGS,

  JS_PropertyStub,  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,

  JS_PropertyStub,  JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,

  JS_EnumerateStub, JS_ResolveStub,  JS_ConvertStub,  JS_FinalizeStub,

  JS_EnumerateStub, JS_ResolveStub,  JS_ConvertStub,  JS_FinalizeStub,

  JSCLASS_NO_OPTIONAL_MEMBERS

  JSCLASS_NO_OPTIONAL_MEMBERS

};

};





    jsval* vp);
  static JSBool ContentsGetter(JSContext* cx, JSObject* obj, jsid idval,
    jsval* vp);
  static JSBool ContentsSetter(JSContext* cx, JSObject* obj, jsid idval, JSBool strict,
    jsval* vp);
  static JSBool IsNull(JSContext* cx, uintN argc, jsval* vp);
}

  static JSBool LengthGetter(JSContext* cx, JSObject* obj, jsid idval,
    jsval* vp);
  static JSBool Getter(JSContext* cx, JSObject* obj, jsid idval, jsval* vp);
  static JSBool Setter(JSContext* cx, JSObject* obj, jsid idval, JSBool strict, jsval* vp);
  static JSBool AddressOfElement(JSContext* cx, uintN argc, jsval* vp);
}


    jsval* vp);
  static JSBool FieldGetter(JSContext* cx, JSObject* obj, jsid idval,
    jsval* vp);
  static JSBool FieldSetter(JSContext* cx, JSObject* obj, jsid idval, JSBool strict,
                            jsval* vp);
  static JSBool AddressOfField(JSContext* cx, uintN argc, jsval* vp);
  static JSBool Define(JSContext* cx, uintN argc, jsval* vp);
}

  static void Finalize(JSContext* cx, JSObject* obj);

  static JSBool ValueGetter(JSContext* cx, JSObject* obj, jsid idval,
                            jsval* vp);
  static JSBool ValueSetter(JSContext* cx, JSObject* obj, jsid idval,
                            JSBool strict, jsval* vp);
  static JSBool Address(JSContext* cx, uintN argc, jsval* vp);
  static JSBool ReadString(JSContext* cx, uintN argc, jsval* vp);
  static JSBool ToSource(JSContext* cx, uintN argc, jsval* vp);

static JSClass sCTypesGlobalClass = {
  "ctypes",
  JSCLASS_HAS_RESERVED_SLOTS(CTYPESGLOBAL_SLOTS),
  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
  JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub,
  JSCLASS_NO_OPTIONAL_MEMBERS
};

static JSClass sCABIClass = {
  "CABI",
  JSCLASS_HAS_RESERVED_SLOTS(CABI_SLOTS),
  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
  JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub,
  JSCLASS_NO_OPTIONAL_MEMBERS
};

static JSClass sCTypeProtoClass = {
  "CType",
  JSCLASS_HAS_RESERVED_SLOTS(CTYPEPROTO_SLOTS),
  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
  JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, CType::FinalizeProtoClass,
  NULL, NULL, ConstructAbstract, ConstructAbstract, NULL, NULL, NULL, NULL
};

static JSClass sCDataProtoClass = {
  "CData",
  0,
  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
  JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub,
  JSCLASS_NO_OPTIONAL_MEMBERS
};

static JSClass sCTypeClass = {
  "CType",
  JSCLASS_HAS_RESERVED_SLOTS(CTYPE_SLOTS) | JSCLASS_MARK_IS_TRACE,
  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
  JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, CType::Finalize,
  NULL, NULL, CType::ConstructData, CType::ConstructData, NULL,
  CType::HasInstance, JS_CLASS_TRACE(CType::Trace), NULL

static JSClass sCClosureClass = {
  "CClosure",
  JSCLASS_HAS_RESERVED_SLOTS(CCLOSURE_SLOTS) | JSCLASS_MARK_IS_TRACE,
  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
  JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, CClosure::Finalize,
  NULL, NULL, NULL, NULL, NULL, NULL, JS_CLASS_TRACE(CClosure::Trace), NULL
};

static JSClass sInt64ProtoClass = {
  "Int64",
  0,
  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
  JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub,
  JSCLASS_NO_OPTIONAL_MEMBERS
};

static JSClass sUInt64ProtoClass = {
  "UInt64",
  0,
  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
  JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub,
  JSCLASS_NO_OPTIONAL_MEMBERS
};

static JSClass sInt64Class = {
  "Int64",
  JSCLASS_HAS_RESERVED_SLOTS(INT64_SLOTS),
  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
  JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, Int64Base::Finalize,
  JSCLASS_NO_OPTIONAL_MEMBERS
};

static JSClass sUInt64Class = {
  "UInt64",
  JSCLASS_HAS_RESERVED_SLOTS(INT64_SLOTS),
  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
  JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, Int64Base::Finalize,
  JSCLASS_NO_OPTIONAL_MEMBERS
};

    return false;

  if (!JS_DefineProperty(cx, global, "ctypes", OBJECT_TO_JSVAL(ctypes),
         JS_PropertyStub, JS_StrictPropertyStub, JSPROP_READONLY | JSPROP_PERMANENT)) {
    return false;
  }


PointerType::ContentsSetter(JSContext* cx,
                            JSObject* obj,
                            jsid idval,
                            JSBool strict,
                            jsval* vp)
{
  if (!CData::IsCData(cx, obj)) {

}

JSBool
ArrayType::Setter(JSContext* cx, JSObject* obj, jsid idval, JSBool strict, jsval* vp)
{
  // This should never happen, but we'll check to be safe.
  if (!CData::IsCData(cx, obj)) {

}

JSBool
StructType::FieldSetter(JSContext* cx, JSObject* obj, jsid idval, JSBool strict, jsval* vp)
{
  if (!CData::IsCData(cx, obj)) {
    JS_ReportError(cx, "not a CData");

}

JSBool
CData::ValueSetter(JSContext* cx, JSObject* obj, jsid idval, JSBool strict, jsval* vp)
{
  if (!IsCData(cx, obj)) {
    JS_ReportError(cx, "not a CData");

(-)a/js/src/ctypes/Library.cpp (-1 / +1 lines)

Line	Link Here

Lines 65-71 namespace Library	Link Here

static JSClass sLibraryClass = {

static JSClass sLibraryClass = {

  "Library",

  "Library",

  JSCLASS_HAS_RESERVED_SLOTS(LIBRARY_SLOTS) | JSCLASS_MARK_IS_TRACE,

  JSCLASS_HAS_RESERVED_SLOTS(LIBRARY_SLOTS) | JSCLASS_MARK_IS_TRACE,

  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,

  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,

  JS_EnumerateStub,JS_ResolveStub, JS_ConvertStub, Library::Finalize,

  JS_EnumerateStub,JS_ResolveStub, JS_ConvertStub, Library::Finalize,

  JSCLASS_NO_OPTIONAL_MEMBERS

  JSCLASS_NO_OPTIONAL_MEMBERS

};

};

(-)a/js/src/jsdbgapi.cpp (-1 / +1 lines)

Line	Link Here

Lines 2170-2176 ethogram_finalize(JSContext *cx, JSObjec	Link Here

2170

static JSClass ethogram_class = {

2170

static JSClass ethogram_class = {

2171

    "Ethogram",

2171

    "Ethogram",

2172

    JSCLASS_HAS_PRIVATE,

2172

    JSCLASS_HAS_PRIVATE,

2173

    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,

2173

    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,

2174

    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, ethogram_finalize,

2174

    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, ethogram_finalize,

2175

    JSCLASS_NO_OPTIONAL_MEMBERS

2175

    JSCLASS_NO_OPTIONAL_MEMBERS

2176

};

2176

};

(-)a/js/src/xpconnect/shell/xpcshell.cpp (-2 / +2 lines)

Line	Link Here

Lines 884-895 static JSFunctionSpec glob_functions[] =	Link Here

884

885

JSClass global_class = {

885

JSClass global_class = {

886

    "global", 0,

886

    "global", 0,

887

    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,

887

    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_StrictPropertyStub,

888

    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   nsnull

888

    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   nsnull

889

};

889

};

890

891

static JSBool

891

static JSBool

892

env_setProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp)

892

env_setProperty(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp)

893

894

/* XXX porting may be easy, but these don't seem to supply setenv by default */

894

/* XXX porting may be easy, but these don't seem to supply setenv by default */

895

#if !defined XP_BEOS && !defined XP_OS2 && !defined SOLARIS

895

#if !defined XP_BEOS && !defined XP_OS2 && !defined SOLARIS

(-)a/js/src/xpconnect/src/nsXPConnect.cpp (-1 / +1 lines)

Line	Link Here

Lines 945-951 TempGlobalResolve(JSContext *aJSContext,	Link Here

945

946

static JSClass xpcTempGlobalClass = {

946

static JSClass xpcTempGlobalClass = {

947

    "xpcTempGlobalClass", JSCLASS_GLOBAL_FLAGS,

947

    "xpcTempGlobalClass", JSCLASS_GLOBAL_FLAGS,

948

    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,

948

    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_StrictPropertyStub,

949

    JS_EnumerateStub, TempGlobalResolve, JS_ConvertStub,   nsnull,

949

    JS_EnumerateStub, TempGlobalResolve, JS_ConvertStub,   nsnull,

950

    JSCLASS_NO_OPTIONAL_MEMBERS

950

    JSCLASS_NO_OPTIONAL_MEMBERS

951

};

951

};

(-)a/js/src/xpconnect/src/qsgen.py (-3 / +6 lines)

Line	Link Here

Lines 778-784 def writeQuickStub(f, customMethodCalls,	Link Here

778

    signature = "static JSBool\n"

778

    signature = "static JSBool\n"

779

    if isAttr:

779

    if isAttr:

780

        # JSPropertyOp signature.

780

        # JSPropertyOp signature.

781

        signature += "%s(JSContext *cx, JSObject *obj, jsid id,%s jsval *vp)\n"

781

        if isSetter:

782

            signature += "%s(JSContext *cx, JSObject *obj, jsid id, JSBool strict,%s jsval *vp)\n"

783

        else:

784

            signature += "%s(JSContext *cx, JSObject *obj, jsid id,%s jsval *vp)\n"

782

    else:

785

    else:

783

        # JSFastNative.

786

        # JSFastNative.

784

        signature += "%s(JSContext *cx, uintN argc,%s jsval *vp)\n"

787

        signature += "%s(JSContext *cx, uintN argc,%s jsval *vp)\n"

Lines 815-822 def writeQuickStub(f, customMethodCalls,	Link Here

815

            argumentValues = (customMethodCall['additionalArgumentValues']

818

            argumentValues = (customMethodCall['additionalArgumentValues']

816

                              % nativeName)

819

                              % nativeName)

817

            if isAttr:

820

            if isAttr:

818

                callTemplate += ("    return %s(cx, obj, id, %s, vp);\n"

821

                callTemplate += ("    return %s(cx, obj, id%s, %s, vp);\n"

819

                                 % (templateName, argumentValues))

822

                                 % (templateName, ", strict" if isSetter else "", argumentValues))

820

            else:

823

            else:

821

                callTemplate += ("    return %s(cx, argc, %s, vp);\n"

824

                callTemplate += ("    return %s(cx, argc, %s, vp);\n"

822

                                 % (templateName, argumentValues))

825

                                 % (templateName, argumentValues))

(-)a/js/src/xpconnect/src/xpccomponents.cpp (-1 / +1 lines)

Line	Link Here

Lines 3116-3122 sandbox_convert(JSContext *cx, JSObject	Link Here

3116

static JSClass SandboxClass = {

3116

static JSClass SandboxClass = {

3117

    "Sandbox",

3117

    "Sandbox",

3118

    JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS | JSCLASS_GLOBAL_FLAGS,

3118

    JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS | JSCLASS_GLOBAL_FLAGS,

3119

    JS_PropertyStub,   JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,

3119

    JS_PropertyStub,   JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,

3120

    sandbox_enumerate, sandbox_resolve, sandbox_convert,  sandbox_finalize,

3120

    sandbox_enumerate, sandbox_resolve, sandbox_convert,  sandbox_finalize,

3121

    JSCLASS_NO_OPTIONAL_MEMBERS

3121

    JSCLASS_NO_OPTIONAL_MEMBERS

3122

};

3122

};





    return entry;
}

// Apply |op| to |obj|, |id|, and |vp|. If |op| is a setter, treat the assignment as lenient.
template<typename Op>
static inline JSBool ApplyPropertyOp(JSContext *cx, Op op, JSObject *obj, jsid id, jsval *vp);

template<>
inline JSBool
ApplyPropertyOp<JSPropertyOp>(JSContext *cx, JSPropertyOp op, JSObject *obj, jsid id, jsval *vp)
{
    return op(cx, obj, id, vp);
}

template<>
inline JSBool
ApplyPropertyOp<JSStrictPropertyOp>(JSContext *cx, JSStrictPropertyOp op, JSObject *obj,
                                    jsid id, jsval *vp)
{
    return op(cx, obj, id, false, vp);
}

template<typename Op>
static JSBool
PropertyOpForwarder(JSContext *cx, uintN argc, jsval *vp)
{

    if(!JS_GetReservedSlot(cx, callee, 0, &v))
        return JS_FALSE;
    JSObject *ptrobj = JSVAL_TO_OBJECT(v);
    Op *popp = static_cast<Op *>(JS_GetPrivate(cx, ptrobj));

    if(!JS_GetReservedSlot(cx, callee, 1, &v))
        return JS_FALSE;

    if (!JS_ValueToId(cx, argval, &id))
        return JS_FALSE;
    JS_SET_RVAL(cx, vp, argval);
    return ApplyPropertyOp<Op>(cx, *popp, obj, id, vp);
}

static void

static JSClass
PointerHolderClass = {
    "Pointer", JSCLASS_HAS_PRIVATE,
    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, PointerFinalize,
    JSCLASS_NO_OPTIONAL_MEMBERS
};

template<typename Op>
static JSObject *
GeneratePropertyOp(JSContext *cx, JSObject *obj, jsid id, uintN argc, Op pop)
                   JSPropertyOp pop)
{
    // The JS engine provides two reserved slots on function objects for
    // XPConnect to use. Use them to stick the necessary info here.
    JSFunction *fun =
        JS_NewFunctionById(cx, PropertyOpForwarder<Op>, argc, 0, obj, id);
                           argc, 0, obj, id);
    if(!fun)
        return JS_FALSE;



    js::AutoObjectRooter tvr(cx, funobj);

    // Unfortunately, we cannot guarantee that Op is aligned. Use a
    // second object to work around this.
    JSObject *ptrobj = JS_NewObject(cx, &PointerHolderClass, nsnull, funobj);
    if(!ptrobj)
        return JS_FALSE;
    Op *popp = new Op;
    if(!popp)
        return JS_FALSE;
    *popp = pop;


static JSBool
ReifyPropertyOps(JSContext *cx, JSObject *obj, jsid id,
                 JSPropertyOp getter, JSStrictPropertyOp setter,
                 JSObject **getterobjp, JSObject **setterobjp)
{
    // Generate both getter and setter and stash them in the prototype.

        *setterobjp = setterobj;
    return JS_DefinePropertyById(cx, obj, id, JSVAL_VOID,
                                 JS_DATA_TO_FUNC_PTR(JSPropertyOp, getterobj),
                                 JS_DATA_TO_FUNC_PTR(JSStrictPropertyOp, setterobj),
                                 attrs);
}


{
    uintN attrs;
    JSBool found;
    JSPropertyOp getter;
    JSStrictPropertyOp setter;
    JSObject *obj2;
    jsval v;
    jsid id;

}

JSBool
xpc_qsGetterOnlyPropertyStub(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
{
    return JS_ReportErrorFlagsAndNumber(cx,
                                        JSREPORT_WARNING | JSREPORT_STRICT |

(-)a/js/src/xpconnect/src/xpcquickstubs.h (-2 / +2 lines)

Line	Link Here

Lines 51-57 class XPCCallContext;	Link Here

struct xpc_qsPropertySpec {

struct xpc_qsPropertySpec {

    const char *name;

    const char *name;

    JSPropertyOp getter;

    JSPropertyOp getter;

    JSPropertyOp setter;

    JSStrictPropertyOp setter;

};

};

struct xpc_qsFunctionSpec {

struct xpc_qsFunctionSpec {

Lines 229-235 xpc_qsThrowBadSetterValue(JSContext *cx,	Link Here

229

230

231

JSBool

231

JSBool

232

xpc_qsGetterOnlyPropertyStub(JSContext *cx, JSObject *obj, jsid id, jsval *vp);

232

xpc_qsGetterOnlyPropertyStub(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp);

233

234

/* Functions for converting values between COM and JS. */

234

/* Functions for converting values between COM and JS. */

235

(-)a/js/src/xpconnect/src/xpcthreadcontext.cpp (-1 / +1 lines)

Line	Link Here

Lines 218-224 static JSClass global_class = {	Link Here

218

#else

218

#else

219

0,

219

0,

220

#endif

220

#endif

221

    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,

221

    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,

222

    JS_EnumerateStub, SafeGlobalResolve, JS_ConvertStub, SafeFinalize,

222

    JS_EnumerateStub, SafeGlobalResolve, JS_ConvertStub, SafeFinalize,

223

    JSCLASS_NO_OPTIONAL_MEMBERS

223

    JSCLASS_NO_OPTIONAL_MEMBERS

224

};

224

};

(-)a/js/src/xpconnect/src/xpcwrappedjsclass.cpp (-1 / +1 lines)

Line	Link Here

Lines 1484-1490 nsXPCWrappedJSClass::CallMethod(nsXPCWra	Link Here

1484

        uintN attrs;

1484

        uintN attrs;

1485

        JSBool found;

1485

        JSBool found;

1486

        JSPropertyOp getter;

1486

        JSPropertyOp getter;

1487

        JSPropertyOp setter;

1487

        JSStrictPropertyOp setter;

1488

        if(!JS_GetPropertyAttrsGetterAndSetter(cx, obj, name,

1488

        if(!JS_GetPropertyAttrsGetterAndSetter(cx, obj, name,

1489

                                               &attrs, &found,

1489

                                               &attrs, &found,

1490

                                               &getter, &setter))

1490

                                               &getter, &setter))





    propFlags |= JSPROP_GETTER | JSPROP_SHARED;
    JSObject* funobj = JSVAL_TO_OBJECT(funval);
    JSPropertyOp getter = JS_DATA_TO_FUNC_PTR(JSPropertyOp, funobj);
    JSStrictPropertyOp setter;
    if(member->IsWritableAttribute())
    {
        propFlags |= JSPROP_SETTER;
        propFlags &= ~JSPROP_READONLY;
        setter = JS_DATA_TO_FUNC_PTR(JSStrictPropertyOp, funobj);
    }
    else
    {

/***************************************************************************/

static JSBool
XPC_WN_OnlyIWrite_AddPropertyStub(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
    XPCCallContext ccx(JS_CALLER, cx, obj, nsnull, id);
    XPCWrappedNative* wrapper = ccx.GetWrapper();
    THROW_AND_RETURN_IF_BAD_WRAPPER(cx, wrapper);

    // Allow only XPConnect to add/set the property
    if(ccx.GetResolveName() == id)
        return JS_TRUE;


}

static JSBool
XPC_WN_OnlyIWrite_SetPropertyStub(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
{
    return XPC_WN_OnlyIWrite_AddPropertyStub(cx, obj, id, vp);
}

static JSBool
XPC_WN_CannotModifyPropertyStub(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
    return Throw(NS_ERROR_XPC_CANT_MODIFY_PROP_ON_WN, cx);
}

static JSBool
XPC_WN_CannotModifyStrictPropertyStub(JSContext *cx, JSObject *obj, jsid id, JSBool strict,
                                      jsval *vp)
{
    return XPC_WN_CannotModifyPropertyStub(cx, obj, id, vp);
}

static JSBool
XPC_WN_Shared_Convert(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
{
    if(type == JSTYPE_OBJECT)

    JSCLASS_MARK_IS_TRACE, // flags;

    /* Mandatory non-null function pointer members. */
    JS_VALUEIFY(js::PropertyOp, XPC_WN_OnlyIWrite_AddPropertyStub),       // addProperty
    JS_VALUEIFY(js::PropertyOp, XPC_WN_CannotModifyPropertyStub),         // delProperty
    js::PropertyStub,                                                     // getProperty
    JS_VALUEIFY(js::StrictPropertyOp, XPC_WN_OnlyIWrite_SetPropertyStub), // setProperty
   
    XPC_WN_Shared_Enumerate,                                     // enumerate
    XPC_WN_NoHelper_Resolve,                                     // resolve

    return Throw(NS_ERROR_XPC_CANT_MODIFY_PROP_ON_WN, cx);
}

static JSBool
XPC_WN_MaybeResolvingStrictPropertyStub(JSContext *cx, JSObject *obj, jsid id, JSBool strict,
                                        jsval *vp)
{
    return XPC_WN_MaybeResolvingPropertyStub(cx, obj, id, vp);
}

// macro fun!
#define PRE_HELPER_STUB_NO_SLIM                                              \
    XPCWrappedNative* wrapper =                                              \

}

static JSBool
XPC_WN_Helper_SetProperty(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
{
    PRE_HELPER_STUB
    SetProperty(wrapper, cx, obj, id, vp, &retval);

    else
        mJSClass.base.getProperty = js::PropertyStub;

    JSStrictPropertyOp setProperty;
    if(mFlags.WantSetProperty())
        setProperty = XPC_WN_Helper_SetProperty;
    else if(mFlags.UseJSStubForSetProperty())
        setProperty = JS_StrictPropertyStub;
    else if(mFlags.AllowPropModsDuringResolve())
        setProperty = XPC_WN_MaybeResolvingStrictPropertyStub;
    else
        setProperty = XPC_WN_CannotModifyStrictPropertyStub;
    mJSClass.base.setProperty = js::Valueify(setProperty);

    // We figure out most of the enumerate strategy at call time.

    js::PropertyStub,               // addProperty;
    js::PropertyStub,               // delProperty;
    js::PropertyStub,               // getProperty;
    js::StrictPropertyStub,         // setProperty;
    XPC_WN_Shared_Proto_Enumerate,  // enumerate;
    XPC_WN_ModsAllowed_Proto_Resolve, // resolve;
    JS_VALUEIFY(js::ConvertOp, XPC_WN_Shared_Proto_Convert), // convert;

    js::PropertyStub,               // addProperty;
    js::PropertyStub,               // delProperty;
    js::PropertyStub,               // getProperty;
    js::StrictPropertyStub,         // setProperty;
    XPC_WN_Shared_Proto_Enumerate,  // enumerate;
    XPC_WN_ModsAllowed_Proto_Resolve,// resolve;
    JS_VALUEIFY(js::ConvertOp, XPC_WN_Shared_Proto_Convert), // convert;

/***************************************************************************/

static JSBool
XPC_WN_OnlyIWrite_Proto_AddPropertyStub(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
    NS_ASSERTION(obj->getClass() == &XPC_WN_NoMods_WithCall_Proto_JSClass ||
                 obj->getClass() == &XPC_WN_NoMods_NoCall_Proto_JSClass,

}

static JSBool
XPC_WN_OnlyIWrite_Proto_SetPropertyStub(JSContext *cx, JSObject *obj, jsid id, JSBool strict,
                                        jsval *vp)
{
    return XPC_WN_OnlyIWrite_Proto_AddPropertyStub(cx, obj, id, vp);
}

static JSBool
XPC_WN_NoMods_Proto_Resolve(JSContext *cx, JSObject *obj, jsid id)
{
    NS_ASSERTION(obj->getClass() == &XPC_WN_NoMods_WithCall_Proto_JSClass ||

    WRAPPER_SLOTS | JSCLASS_MARK_IS_TRACE, // flags;

    /* Mandatory non-null function pointer members. */
    JS_VALUEIFY(js::PropertyOp, XPC_WN_OnlyIWrite_Proto_AddPropertyStub),       // addProperty;
    JS_VALUEIFY(js::PropertyOp, XPC_WN_CannotModifyPropertyStub),               // delProperty;
    js::PropertyStub,                                                           // getProperty;
    JS_VALUEIFY(js::StrictPropertyOp, XPC_WN_OnlyIWrite_Proto_SetPropertyStub), // setProperty;
    XPC_WN_Shared_Proto_Enumerate,                                              // enumerate;
    XPC_WN_NoMods_Proto_Resolve,                                                // resolve;
    JS_VALUEIFY(js::ConvertOp, XPC_WN_Shared_Proto_Convert),                    // convert;
    XPC_WN_Shared_Proto_Finalize,                                               // finalize;

    /* Optionally non-null members start here. */
    nsnull,                         // reserved0;

    WRAPPER_SLOTS | JSCLASS_MARK_IS_TRACE,              // flags;

    /* Mandatory non-null function pointer members. */
    JS_VALUEIFY(js::PropertyOp, XPC_WN_OnlyIWrite_Proto_AddPropertyStub),       // addProperty;
    JS_VALUEIFY(js::PropertyOp, XPC_WN_CannotModifyPropertyStub),               // delProperty;
    js::PropertyStub,                                                           // getProperty;
    JS_VALUEIFY(js::StrictPropertyOp, XPC_WN_OnlyIWrite_Proto_SetPropertyStub), // setProperty;
    XPC_WN_Shared_Proto_Enumerate,                                              // enumerate;
    XPC_WN_NoMods_Proto_Resolve,                                                // resolve;
    JS_VALUEIFY(js::ConvertOp, XPC_WN_Shared_Proto_Convert),                    // convert;
    XPC_WN_Shared_Proto_Finalize,                                               // finalize;

    /* Optionally non-null members start here. */
    nsnull,                         // reserved0;

    "WrappedNative_TearOff",                        // name;
    WRAPPER_SLOTS | JSCLASS_MARK_IS_TRACE,          // flags;

    JS_VALUEIFY(js::PropertyOp, XPC_WN_OnlyIWrite_AddPropertyStub),       // addProperty;
    JS_VALUEIFY(js::PropertyOp, XPC_WN_CannotModifyPropertyStub),         // delProperty;
    js::PropertyStub,                                                     // getProperty;
    JS_VALUEIFY(js::StrictPropertyOp, XPC_WN_OnlyIWrite_SetPropertyStub), // setProperty;
    XPC_WN_TearOff_Enumerate,                                             // enumerate;
    XPC_WN_TearOff_Resolve,                                               // resolve;
    JS_VALUEIFY(js::ConvertOp, XPC_WN_Shared_Convert),                    // convert;
    XPC_WN_TearOff_Finalize                                               // finalize;
};

(-)a/js/src/xpconnect/src/xpcwrappednativescope.cpp (-1 / +1 lines)

Line	Link Here

Lines 209-215 js::Class XPC_WN_NoHelper_Proto_JSClass	Link Here

209

    js::PropertyStub,               // addProperty;

209

    js::PropertyStub,               // addProperty;

210

    js::PropertyStub,               // delProperty;

210

    js::PropertyStub,               // delProperty;

211

    js::PropertyStub,               // getProperty;

211

    js::PropertyStub,               // getProperty;

212

    js::PropertyStub,               // setProperty;

212

    js::StrictPropertyStub,         // setProperty;

213

    js::EnumerateStub,              // enumerate;

213

    js::EnumerateStub,              // enumerate;

214

    JS_ResolveStub,                 // resolve;

214

    JS_ResolveStub,                 // resolve;

215

    js::ConvertStub,                // convert;

215

    js::ConvertStub,                // convert;

(-)a/js/src/xpconnect/tests/TestXPC.cpp (-1 / +1 lines)

Line	Link Here

Lines 138-144 static JSFunctionSpec glob_functions[] =	Link Here

138

139

static JSClass global_class = {

139

static JSClass global_class = {

140

    "global", 0,

140

    "global", 0,

141

    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,

141

    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_StrictPropertyStub,

142

    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   nsnull

142

    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   nsnull

143

};

143

};

144





holder_get(JSContext *cx, JSObject *holder, jsid id, jsval *vp);

static JSBool
holder_set(JSContext *cx, JSObject *holder, jsid id, JSBool strict, jsval *vp);

namespace XrayUtils {


}

static JSBool
holder_set(JSContext *cx, JSObject *wrapper, jsid id, JSBool strict, jsval *vp)
{
    NS_ASSERTION(wrapper->isProxy(), "bad this object in set");
    JSObject *holder = GetHolder(wrapper);

        // don't have one, we have to avoid calling the scriptable helper's
        // GetProperty method for this property, so stub out the getter and
        // setter here explicitly.
        desc->getter = JS_PropertyStub;
        desc->setter = JS_StrictPropertyStub;
    }

    if (!JS_WrapValue(cx, &desc->value) || !JS_WrapValue(cx, &fval))

    if (desc->attrs & JSPROP_GETTER)
        desc->getter = CastAsJSPropertyOp(JSVAL_TO_OBJECT(fval));
    if (desc->attrs & JSPROP_SETTER)
        desc->setter = CastAsJSStrictPropertyOp(JSVAL_TO_OBJECT(fval));

    // Define the property.
    return JS_DefinePropertyById(cx, holder, id, desc->value,

template <typename Base>
bool
XrayWrapper<Base>::set(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id,
                       bool strict, js::Value *vp)
{
    // Skip our Base if it isn't already JSProxyHandler.
    // NB: None of the functions we call are prepared for the receiver not
    // being the wrapper, so ignore the receiver here.
    return JSProxyHandler::set(cx, wrapper, wrapper, id, strict, vp);
}

template <typename Base>

(-)a/js/src/xpconnect/wrappers/XrayWrapper.h (-1 / +1 lines)

Line	Link Here

Lines 84-90 class XrayWrapper : public Base {	Link Here

    virtual bool get(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id,

    virtual bool get(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id,

                     js::Value *vp);

                     js::Value *vp);

    virtual bool set(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id,

    virtual bool set(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id,

                     js::Value *vp);

                     bool strict, js::Value *vp);

    virtual bool has(JSContext *cx, JSObject *wrapper, jsid id, bool *bp);

    virtual bool has(JSContext *cx, JSObject *wrapper, jsid id, bool *bp);

    virtual bool hasOwn(JSContext *cx, JSObject *wrapper, jsid id, bool *bp);

    virtual bool hasOwn(JSContext *cx, JSObject *wrapper, jsid id, bool *bp);

    virtual bool keys(JSContext *cx, JSObject *wrapper, js::AutoIdVector &props);

    virtual bool keys(JSContext *cx, JSObject *wrapper, js::AutoIdVector &props);

(-)a/modules/plugin/base/src/nsJSNPRuntime.cpp (-3 / +3 lines)

Line	Link Here

Lines 151-157 static JSBool	Link Here

151

NPObjWrapper_DelProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp);

151

NPObjWrapper_DelProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp);

152

153

static JSBool

153

static JSBool

154

NPObjWrapper_SetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp);

154

NPObjWrapper_SetProperty(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp);

155

156

static JSBool

156

static JSBool

157

NPObjWrapper_GetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp);

157

NPObjWrapper_GetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp);

Lines 215-221 static JSClass sNPObjectMemberClass =	Link Here

215

216

    "NPObject Ambiguous Member class", JSCLASS_HAS_PRIVATE,

216

    "NPObject Ambiguous Member class", JSCLASS_HAS_PRIVATE,

217

    JS_PropertyStub, JS_PropertyStub,

217

    JS_PropertyStub, JS_PropertyStub,

218

    JS_PropertyStub, JS_PropertyStub, JS_EnumerateStub,

218

    JS_PropertyStub, JS_StrictPropertyStub, JS_EnumerateStub,

219

    JS_ResolveStub, NPObjectMember_Convert,

219

    JS_ResolveStub, NPObjectMember_Convert,

220

    NPObjectMember_Finalize, nsnull, nsnull, NPObjectMember_Call,

220

    NPObjectMember_Finalize, nsnull, nsnull, NPObjectMember_Call,

221

    nsnull, nsnull, nsnull, NPObjectMember_Mark, nsnull

221

    nsnull, nsnull, nsnull, NPObjectMember_Mark, nsnull

Lines 1248-1254 NPObjWrapper_DelProperty(JSContext *cx,	Link Here

1248

1249

1250

static JSBool

1250

static JSBool

1251

NPObjWrapper_SetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp)

1251

NPObjWrapper_SetProperty(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp)

1252

1253

  NPObject *npobj = GetNPObject(cx, obj);

1253

  NPObject *npobj = GetNPObject(cx, obj);

1254

Return to bug 537873