Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-02 12:32:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1322080 (part 3) - Remove nsIXPCScriptable::addProperty. r=peterv.

Browse Source 
The only non-trivial implementation of this method is in nsEventTargetSH, but
it's never called, so no point keeping it around. (Similar methods were removed
in bug 1132184 and bug 1132187.)
This commit is contained in:
Nicholas Nethercote 2016-12-02 17:37:55 +11:00
parent f4dc382625
commit d307e2a3a9
6 changed files with 2 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dom/base/nsDOMClassInfo.cpp
View File

@ -791,16 +791,6 @@ nsDOMClassInfo::PreCreate(nsISupports *nativeObj, JSContext *cx,
return NS_OK;
}
NS_IMETHODIMP
nsDOMClassInfo::AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
JSObject *obj, jsid id, JS::Handle<JS::Value> val,
bool *_retval)
{
NS_WARNING("nsDOMClassInfo::AddProperty Don't call me!");
return NS_ERROR_UNEXPECTED;
}
NS_IMETHODIMP
nsDOMClassInfo::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
JSObject *obj, jsid id, JS::Value *vp,
@ -1964,16 +1954,6 @@ nsEventTargetSH::PreCreate(nsISupports *nativeObj, JSContext *cx,
return *parentObj ? NS_OK : NS_ERROR_FAILURE;
}
NS_IMETHODIMP
nsEventTargetSH::AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
JSObject *obj, jsid id, JS::Handle<JS::Value> val,
bool *_retval)
{
nsEventTargetSH::PreserveWrapper(GetNative(wrapper, obj));
return NS_OK;
}
void
nsEventTargetSH::PreserveWrapper(nsISupports *aNative)
{

3
dom/base/nsDOMClassInfo.h
View File

@ -175,9 +175,6 @@ protected:
public:
NS_IMETHOD PreCreate(nsISupports *nativeObj, JSContext *cx,
JSObject *globalObj, JSObject **parentObj) override;
NS_IMETHOD AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
JSObject *obj, jsid id, JS::Handle<JS::Value> val,
bool *_retval) override;
virtual void PreserveWrapper(nsISupports *aNative) override;
};

6
js/xpconnect/idl/nsIXPCScriptable.idl
View File

@ -40,7 +40,7 @@ interface nsIXPCScriptable : nsISupports
const uint32_t WANT_PRECREATE = 1 << 0;
// unused bit here
// unused bit here
const uint32_t WANT_ADDPROPERTY = 1 << 3;
// unused bit here
// unused bit here
const uint32_t WANT_GETPROPERTY = 1 << 5;
const uint32_t WANT_SETPROPERTY = 1 << 6;
@ -77,10 +77,6 @@ interface nsIXPCScriptable : nsISupports
void preCreate(in nsISupports nativeObj, in JSContextPtr cx,
in JSObjectPtr globalObj, out JSObjectPtr parentObj);
boolean addProperty(in nsIXPConnectWrappedNative wrapper,
in JSContextPtr cx, in JSObjectPtr obj, in jsid id,
in jsval val);
boolean getProperty(in nsIXPConnectWrappedNative wrapper,
in JSContextPtr cx, in JSObjectPtr obj, in jsid id,
in JSValPtr vp);

12
js/xpconnect/public/xpc_map_end.h
View File

@ -34,9 +34,6 @@ XPC_MAP_CLASSNAME::GetScriptableFlags()
#ifdef XPC_MAP_WANT_PRECREATE
nsIXPCScriptable::WANT_PRECREATE |
#endif
#ifdef XPC_MAP_WANT_ADDPROPERTY
nsIXPCScriptable::WANT_ADDPROPERTY |
#endif
#ifdef XPC_MAP_WANT_GETPROPERTY
nsIXPCScriptable::WANT_GETPROPERTY |
#endif
@ -77,11 +74,6 @@ NS_IMETHODIMP XPC_MAP_CLASSNAME::PreCreate(nsISupports* nativeObj, JSContext * c
{NS_ERROR("never called"); return NS_ERROR_NOT_IMPLEMENTED;}
#endif
#ifndef XPC_MAP_WANT_ADDPROPERTY
NS_IMETHODIMP XPC_MAP_CLASSNAME::AddProperty(nsIXPConnectWrappedNative* wrapper, JSContext * cx, JSObject * obj, jsid id, JS::HandleValue val, bool* _retval)
{NS_ERROR("never called"); return NS_ERROR_NOT_IMPLEMENTED;}
#endif
#ifndef XPC_MAP_WANT_GETPROPERTY
NS_IMETHODIMP XPC_MAP_CLASSNAME::GetProperty(nsIXPConnectWrappedNative* wrapper, JSContext * cx, JSObject * obj, jsid id, JS::Value * vp, bool* _retval)
{NS_WARNING("never called"); return NS_ERROR_NOT_IMPLEMENTED;}
@ -139,10 +131,6 @@ NS_IMETHODIMP XPC_MAP_CLASSNAME::PostCreatePrototype(JSContext* cx, JSObject* pr
#undef XPC_MAP_WANT_PRECREATE
#endif
#ifdef XPC_MAP_WANT_ADDPROPERTY
#undef XPC_MAP_WANT_ADDPROPERTY
#endif
#ifdef XPC_MAP_WANT_GETPROPERTY
#undef XPC_MAP_WANT_GETPROPERTY
#endif

13
js/xpconnect/src/XPCWrappedNativeJSOps.cpp
View File

@ -715,15 +715,6 @@ XPC_WN_MaybeResolvingDeletePropertyStub(JSContext* cx, HandleObject obj, HandleI
return Throw(rv, cx); \
return retval ? result.succeed() : result.failMethod();
static bool
XPC_WN_Helper_AddProperty(JSContext* cx, HandleObject obj, HandleId id,
HandleValue v)
{
PRE_HELPER_STUB
AddProperty(wrapper, cx, obj, id, v, &retval);
POST_HELPER_STUB
}
bool
XPC_WN_Helper_GetProperty(JSContext* cx, HandleObject obj, HandleId id,
MutableHandleValue vp)
@ -987,9 +978,7 @@ XPCNativeScriptableShared::XPCNativeScriptableShared(uint32_t aFlags,
memset(cOps, 0, sizeof(js::ClassOps));
mJSClass.cOps = cOps;
if (mFlags.WantAddProperty())
cOps->addProperty = XPC_WN_Helper_AddProperty;
else if (mFlags.UseJSStubForAddProperty())
if (mFlags.UseJSStubForAddProperty())
cOps->addProperty = nullptr;
else if (mFlags.AllowPropModsDuringResolve())
cOps->addProperty = XPC_WN_MaybeResolvingPropertyStub;

1
js/xpconnect/src/xpcprivate.h
View File

@ -1428,7 +1428,6 @@ public:
#define GET_IT(f_) const { return 0 != (mFlags & nsIXPCScriptable:: f_ ); }
bool WantPreCreate() GET_IT(WANT_PRECREATE)
bool WantAddProperty() GET_IT(WANT_ADDPROPERTY)
bool WantGetProperty() GET_IT(WANT_GETPROPERTY)
bool WantSetProperty() GET_IT(WANT_SETPROPERTY)
bool WantEnumerate() GET_IT(WANT_ENUMERATE)