KotJohansson/palemoon27
1
0
Fork 0
mirror of https://github.com/roytam1/palemoon27.git synced 2026-05-26 14:30:27 +00:00
Code Issues Projects Releases Wiki Activity

import change from `dev' branch of rmottola/Arctic-Fox:

Browse Source 
- goanna -> gecko (cac9263ee)
This commit is contained in:
Roy Tam
2020-07-11 08:42:58 +08:00
parent c7f8abfdb0
commit 30dd322d5a
773 changed files with 2295 additions and 3890 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/ipc/JavaScriptShared.cpp
+4 -4
View File
@@ -234,7 +234,7 @@ JavaScriptShared::incref()
}
bool
JavaScriptShared::convertIdToGoannaString(JSContext* cx, JS::HandleId id, nsString* to)
JavaScriptShared::convertIdToGeckoString(JSContext* cx, JS::HandleId id, nsString* to)
{
RootedValue idval(cx);
if (!JS_IdToValue(cx, id, &idval))
@@ -248,7 +248,7 @@ JavaScriptShared::convertIdToGoannaString(JSContext* cx, JS::HandleId id, nsStri
}
bool
JavaScriptShared::convertGoannaStringToId(JSContext* cx, const nsString& from, JS::MutableHandleId to)
JavaScriptShared::convertGeckoStringToId(JSContext* cx, const nsString& from, JS::MutableHandleId to)
{
RootedString str(cx, JS_NewUCStringCopyN(cx, from.BeginReading(), from.Length()));
if (!str)
@@ -434,7 +434,7 @@ JavaScriptShared::fromJSIDVariant(JSContext* cx, const JSIDVariant& from, Mutabl
}
case JSIDVariant::TnsString:
return convertGoannaStringToId(cx, from.get_nsString(), to);
return convertGeckoStringToId(cx, from.get_nsString(), to);
case JSIDVariant::Tint32_t:
to.set(INT_TO_JSID(from.get_int32_t()));
@@ -744,7 +744,7 @@ JavaScriptShared::Wrap(JSContext* cx, HandleObject aObj, InfallibleTArray<CpowEn
id = ids[i];
nsString str;
if (!convertIdToGoannaString(cx, id, &str))
if (!convertIdToGeckoString(cx, id, &str))
return false;
if (!JS_GetPropertyById(cx, aObj, id, &v))