corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1114580 - Change ESClassValue to an enum class. r=jorendorff

Browse Source
This commit is contained in:
Tom Schuster
2016-06-30 00:04:56 +02:00
parent 091656144c
commit 88135ce2c1
32 changed files with 143 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
js/ipc/WrapperOwner.cpp
View File

@@ -126,8 +126,7 @@ class CPOWProxyHandler : public BaseProxyHandler
AutoIdVector& props) const override;
virtual bool hasInstance(JSContext* cx, HandleObject proxy,
MutableHandleValue v, bool* bp) const override;
virtual bool getBuiltinClass(JSContext* cx, HandleObject obj,
js::ESClassValue* classValue) const override;
virtual bool getBuiltinClass(JSContext* cx, HandleObject obj, js::ESClass* cls) const override;
virtual bool isArray(JSContext* cx, HandleObject obj,
IsArrayAnswer* answer) const override;
virtual const char* className(JSContext* cx, HandleObject proxy) const override;
@@ -729,23 +728,21 @@ WrapperOwner::hasInstance(JSContext* cx, HandleObject proxy, MutableHandleValue
}
bool
CPOWProxyHandler::getBuiltinClass(JSContext* cx, HandleObject proxy,
js::ESClassValue* classValue) const
CPOWProxyHandler::getBuiltinClass(JSContext* cx, HandleObject proxy, ESClass* cls) const
{
FORWARD(getBuiltinClass, (cx, proxy, classValue));
FORWARD(getBuiltinClass, (cx, proxy, cls));
}
bool
WrapperOwner::getBuiltinClass(JSContext* cx, HandleObject proxy,
js::ESClassValue* classValue)
WrapperOwner::getBuiltinClass(JSContext* cx, HandleObject proxy, ESClass* cls)
{
ObjectId objId = idOf(proxy);
uint32_t cls = ESClass_Other;
uint32_t classValue = uint32_t(ESClass::Other);
ReturnStatus status;
if (!SendGetBuiltinClass(objId, &status, &cls))
if (!SendGetBuiltinClass(objId, &status, &classValue))
return ipcfail(cx);
*classValue = ESClassValue(cls);
*cls = ESClass(classValue);
LOG_STACK();