wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1153688, treat JS Symbol as void on C++ side of Variant, r=bholley

Browse Source
This commit is contained in:
Olli Pettay 2015-04-17 17:30:34 +03:00
parent e23b0186b2
commit 1f01e0da8e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/xpconnect/src/XPCVariant.cpp
View File

@ -182,7 +182,7 @@ XPCArrayHomogenizer::GetTypeForArray(JSContext* cx, HandleObject array,
type = tDbl;
} else if (val.isBoolean()) {
type = tBool;
} else if (val.isUndefined()) {
} else if (val.isUndefined() || val.isSymbol()) {
state = tVar;
break;
} else if (val.isNull()) {
@ -265,7 +265,8 @@ bool XPCVariant::InitializeData(JSContext* cx)
return NS_SUCCEEDED(nsVariant::SetFromDouble(&mData, val.toDouble()));
if (val.isBoolean())
return NS_SUCCEEDED(nsVariant::SetFromBool(&mData, val.toBoolean()));
if (val.isUndefined())
// We can't represent symbol on C++ side, so pretend it is void.
if (val.isUndefined() || val.isSymbol())
return NS_SUCCEEDED(nsVariant::SetToVoid(&mData));
if (val.isNull())
return NS_SUCCEEDED(nsVariant::SetToEmpty(&mData));