Added Wrapper for JSExternalStringCallbacks

Author: redfire75369

src/glue_wrappers.in

@@ -15,7 +15,7 @@ wrap!(glue: pub fn RUST_SYMBOL_TO_JSID(sym: *mut Symbol, id: MutableHandleId));
 wrap!(glue: pub fn RUST_JSID_IS_VOID(id: HandleId) -> bool);
 wrap!(glue: pub fn RUST_INTERNED_STRING_TO_JSID(cx: *mut JSContext, str: *mut JSString, id: MutableHandleId));
 wrap!(glue: pub fn AppendToIdVector(v: MutableHandleIdVector, id: HandleId) -> bool);
-wrap!(glue: pub fn JS_GetPromiseResult (promise: HandleObject, dest: MutableHandleValue));
+wrap!(glue: pub fn JS_GetPromiseResult(promise: HandleObject, dest: MutableHandleValue));
 wrap!(glue: pub fn JS_GetScriptPrivate(script: *mut JSScript, dest: MutableHandleValue));
 wrap!(glue: pub fn JS_GetModulePrivate(module: *mut JSObject, dest: MutableHandleValue));
 wrap!(glue: pub fn EncodeStringToUTF8(cx: *mut JSContext, str: HandleString, cb: fn(*const c_char)));

src/jsapi_wrappers.in

@@ -174,7 +174,7 @@ wrap!(jsapi: pub fn ReadableStreamReaderReleaseLock(cx: *mut JSContext, reader:
 wrap!(jsapi: pub fn ReadableStreamDefaultReaderRead(cx: *mut JSContext, reader: HandleObject) -> *mut JSObject);
 wrap!(jsapi: pub fn IsWasmModuleObject(obj: HandleObject) -> bool);
 wrap!(jsapi: pub fn GetWasmModule(obj: HandleObject) -> RefPtr<WasmModule>);
-wrap!(jsapi: pub fn JS_EncodeStringToUTF8(cx: *mut JSContext, str: Handle<*mut JSString>) -> UniqueChars);
+wrap!(jsapi: pub fn JS_EncodeStringToUTF8(cx: *mut JSContext, str_: Handle<*mut JSString>) -> UniqueChars);
 wrap!(jsapi: pub fn JS_ValueToObject(cx: *mut JSContext, v: HandleValue, objp: MutableHandleObject) -> bool);
 wrap!(jsapi: pub fn JS_ValueToFunction(cx: *mut JSContext, v: HandleValue) -> *mut JSFunction);
 wrap!(jsapi: pub fn JS_ValueToConstructor(cx: *mut JSContext, v: HandleValue) -> *mut JSFunction);
@@ -301,15 +301,15 @@ wrap!(jsapi: pub fn JS_DefineFunctionById(cx: *mut JSContext, obj: HandleObject,
 wrap!(jsapi: pub fn JS_GetFunctionScript(cx: *mut JSContext, fun: HandleFunction) -> *mut JSScript);
 wrap!(jsapi: pub fn JS_DecompileScript(cx: *mut JSContext, script: Handle<*mut JSScript>) -> *mut JSString);
 wrap!(jsapi: pub fn JS_DecompileFunction(cx: *mut JSContext, fun: Handle<*mut JSFunction>) -> *mut JSString);
-wrap!(jsapi: pub fn JS_AtomizeAndPinJSString(cx: *mut JSContext, str: HandleString) -> *mut JSString);
-wrap!(jsapi: pub fn JS_NewDependentString(cx: *mut JSContext, str: HandleString, start: usize, length: usize) -> *mut JSString);
+wrap!(jsapi: pub fn JS_AtomizeAndPinJSString(cx: *mut JSContext, str_: HandleString) -> *mut JSString);
+wrap!(jsapi: pub fn JS_NewDependentString(cx: *mut JSContext, str_: HandleString, start: usize, length: usize) -> *mut JSString);
 wrap!(jsapi: pub fn JS_ConcatStrings(cx: *mut JSContext, left: HandleString, right: HandleString) -> *mut JSString);
 wrap!(jsapi: pub fn JS_GetPendingException(cx: *mut JSContext, vp: MutableHandleValue) -> bool);
 wrap!(jsapi: pub fn JS_SetPendingException(cx: *mut JSContext, v: HandleValue, behavior: ExceptionStackBehavior));
 wrap!(jsapi: pub fn JS_ErrorFromException(cx: *mut JSContext, obj: HandleObject) -> *mut JSErrorReport);
 wrap!(jsapi: pub fn JS_IndexToId(cx: *mut JSContext, index: u32, arg1: MutableHandleId) -> bool);
 wrap!(jsapi: pub fn JS_CharsToId(cx: *mut JSContext, chars: TwoByteChars, arg1: MutableHandleId) -> bool);
-wrap!(jsapi: pub fn JS_IsIdentifier(cx: *mut JSContext, str: HandleString, isIdentifier: *mut bool) -> bool);
+wrap!(jsapi: pub fn JS_IsIdentifier(cx: *mut JSContext, str_: HandleString, isIdentifier: *mut bool) -> bool);
 wrap!(jsapi: pub fn JS_FindCompilationScope(cx: *mut JSContext, obj: HandleObject) -> *mut JSObject);
 wrap!(jsapi: pub fn JS_NewObjectWithoutMetadata(cx: *mut JSContext, clasp: *const JSClass, proto: HandleObject) -> *mut JSObject);
 wrap!(jsapi: pub fn JS_NondeterministicGetWeakMapKeys(cx: *mut JSContext, obj: HandleObject, ret: MutableHandleObject) -> bool);
@@ -326,14 +326,14 @@ wrap!(jsapi: pub fn JS_ExecuteScript2(cx: *mut JSContext, envChain: HandleObject
 wrap!(jsapi: pub fn JS_ExecuteScript3(cx: *mut JSContext, envChain: HandleObjectVector, script: Handle<*mut JSScript>) -> bool);
 wrap!(jsapi: pub fn JS_Stringify(cx: *mut JSContext, value: MutableHandle<Value>, replacer: HandleObject, space: Handle<Value>, callback: JSONWriteCallback, data: *mut ::std::os::raw::c_void) -> bool);
 wrap!(jsapi: pub fn JS_ParseJSON(cx: *mut JSContext, chars: *const u16, len: u32, vp: MutableHandle<Value>) -> bool);
-wrap!(jsapi: pub fn JS_ParseJSON1(cx: *mut JSContext, str: Handle<*mut JSString>, vp: MutableHandle<Value>) -> bool);
+wrap!(jsapi: pub fn JS_ParseJSON1(cx: *mut JSContext, str_: Handle<*mut JSString>, vp: MutableHandle<Value>) -> bool);
 wrap!(jsapi: pub fn JS_ParseJSONWithReviver(cx: *mut JSContext, chars: *const u16, len: u32, reviver: Handle<Value>, vp: MutableHandle<Value>) -> bool);
-wrap!(jsapi: pub fn JS_ParseJSONWithReviver1(cx: *mut JSContext, str: Handle<*mut JSString>, reviver: Handle<Value>, vp: MutableHandle<Value>) -> bool);
+wrap!(jsapi: pub fn JS_ParseJSONWithReviver1(cx: *mut JSContext, str_: Handle<*mut JSString>, reviver: Handle<Value>, vp: MutableHandle<Value>) -> bool);
 wrap!(jsapi: pub fn JS_ReadStructuredClone(cx: *mut JSContext, data: *const JSStructuredCloneData, version: u32, scope: StructuredCloneScope, vp: MutableHandleValue, cloneDataPolicy: *const CloneDataPolicy, optionalCallbacks: *const JSStructuredCloneCallbacks, closure: *mut ::std::os::raw::c_void) -> bool);
 wrap!(jsapi: pub fn JS_WriteStructuredClone(cx: *mut JSContext, v: HandleValue, data: *mut JSStructuredCloneData, scope: StructuredCloneScope, cloneDataPolicy: *const CloneDataPolicy, optionalCallbacks: *const JSStructuredCloneCallbacks, closure: *mut ::std::os::raw::c_void, transferable: HandleValue) -> bool);
 wrap!(jsapi: pub fn JS_StructuredClone(cx: *mut JSContext, v: HandleValue, vp: MutableHandleValue, optionalCallbacks: *const JSStructuredCloneCallbacks, closure: *mut ::std::os::raw::c_void) -> bool);
 wrap!(jsapi: pub fn JS_ReadTypedArray(r: *mut JSStructuredCloneReader, vp: MutableHandleValue) -> bool);
-wrap!(jsapi: pub fn JS_WriteString(w: *mut JSStructuredCloneWriter, str: HandleString) -> bool);
+wrap!(jsapi: pub fn JS_WriteString(w: *mut JSStructuredCloneWriter, str_: HandleString) -> bool);
 wrap!(jsapi: pub fn JS_WriteTypedArray(w: *mut JSStructuredCloneWriter, v: HandleValue) -> bool);
 wrap!(jsapi: pub fn JS_ObjectNotWritten(w: *mut JSStructuredCloneWriter, obj: HandleObject) -> bool);
 wrap!(jsapi: pub fn JS_NewInt8ArrayFromArray(cx: *mut JSContext, array: HandleObject) -> *mut JSObject);

src/jsglue.cpp

@@ -59,7 +59,7 @@ class RustJobQueue : public JS::JobQueue{
     return mTraps.getIncumbentGlobal(mQueue, cx);
   }
 
-  bool enqueuePromiseJob(JSContext* cx, JS::HandleObject promise,
+  virtual bool enqueuePromiseJob(JSContext* cx, JS::HandleObject promise,
                          JS::HandleObject job, JS::HandleObject allocationSite,
                          JS::HandleObject incumbentGlobal)
   {
@@ -114,12 +114,10 @@ class RustReadableStreamUnderlyingSource : public JS::ReadableStreamUnderlyingSo
 	return resolve_to;
   }
 
-
   virtual void onClosed(JSContext* cx, JS::HandleObject stream) {
 	return mTraps.onClosed(mSource, cx, stream);
   }
 
-
   virtual void onErrored(JSContext* cx, JS::HandleObject stream, JS::HandleValue reason) {
 	return mTraps.onErrored(mSource, cx, stream, reason);
   }
@@ -129,6 +127,30 @@ class RustReadableStreamUnderlyingSource : public JS::ReadableStreamUnderlyingSo
   }
 };
 
+struct JSExternalStringCallbacksTraps {
+  void (*finalize)(void* privateData, char16_t* chars);
+  size_t (*sizeOfBuffer)(void* privateData, const char16_t* chars, mozilla::MallocSizeOf mallocSizeOf);
+};
+
+class RustJSExternalStringCallbacks final : public JSExternalStringCallbacks {
+  JSExternalStringCallbacksTraps mTraps;
+  void *privateData;
+public:
+  RustJSExternalStringCallbacks(const JSExternalStringCallbacksTraps& aTraps, void* privateData)
+  : mTraps(aTraps)
+  , privateData(privateData)
+  {
+  }
+
+  void finalize(char16_t* chars) const override {
+    return mTraps.finalize(privateData, chars);
+  }
+
+  size_t sizeOfBuffer(const char16_t* chars, mozilla::MallocSizeOf mallocSizeOf) const override {
+    return mTraps.sizeOfBuffer(privateData, chars, mallocSizeOf);
+  }
+};
+
 struct ProxyTraps {
     bool (*enter)(JSContext *cx, JS::HandleObject proxy, JS::HandleId id,
                   js::BaseProxyHandler::Action action, bool *bp);
@@ -556,7 +578,6 @@ class RustJSPrincipals final : public JSPrincipals
              : false;
     }
 
-
     bool isSystemOrAddonPrincipal() override {
         return this->callbacks.isSystemOrAddonPrincipal(this);
     }
@@ -1222,6 +1243,17 @@ DeleteReadableStreamUnderlyingSource(JS::ReadableStreamUnderlyingSource* source)
   delete source;
 }
 
+JSExternalStringCallbacks*
+CreateRustJSExternalStringCallbacks(const JSExternalStringCallbacksTraps* aTraps, void* aCallbacks)
+{
+  return new RustJSExternalStringCallbacks(*aTraps, aCallbacks);
+}
+
+void DeleteRustJSExternalStringCallbacks(JSExternalStringCallbacks* callbacks)
+{
+  delete static_cast<RustJSExternalStringCallbacks*>(callbacks);
+}
+
 void
 DispatchableRun(JSContext* cx, JS::Dispatchable* ptr, JS::Dispatchable::MaybeShuttingDown mb) {
   ptr->run(cx, mb);