mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

refactor: replace V8 hidden values with WeakMap / WeakSet (#26659)

Browse source
This commit is contained in:
Milan Burda 2020-11-24 22:11:39 +01:00 • committed by GitHub
parent 0be6c92aa9
commit c8d77cae4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/renderer/api/remote.ts
View file

@ -23,6 +23,9 @@ const finalizationRegistry = new (window as any).FinalizationRegistry((id: numbe
}
});
const electronIds = new WeakMap<Object, number>();
const isReturnValue = new WeakSet<Object>();
function getCachedRemoteObject (id: number) {
const ref = remoteObjectCache.get(id);
if (ref !== undefined) {
@ -90,10 +93,10 @@ function wrapArgs (args: any[], visited = new Set()): any {
value.then(onFulfilled, onRejected);
})
};
} else if (v8Util.getHiddenValue(value, 'electronId')) {
} else if (electronIds.has(value)) {
return {
type: 'remote-object',
id: v8Util.getHiddenValue(value, 'electronId')
id: electronIds.get(value)
};
}
@ -111,7 +114,7 @@ function wrapArgs (args: any[], visited = new Set()): any {
}
visited.delete(value);
return meta;
} else if (typeof value === 'function' && v8Util.getHiddenValue(value, 'returnValue')) {
} else if (typeof value === 'function' && isReturnValue.has(value)) {
return {
type: 'function-with-return-value',
value: valueToMeta(value())
@ -120,7 +123,7 @@ function wrapArgs (args: any[], visited = new Set()): any {
return {
type: 'function',
id: callbacksRegistry.add(value),
location: v8Util.getHiddenValue(value, 'location'),
location: callbacksRegistry.getLocation(value),
length: value.length
};
} else {
@ -287,7 +290,7 @@ function metaToValue (meta: MetaType): any {
}
// Track delegate obj's lifetime & tell browser to clean up when object is GCed.
v8Util.setHiddenValue(ret, 'electronId', meta.id);
electronIds.set(ret, meta.id);
setCachedRemoteObject(meta.id, ret);
return ret;
}
@ -373,7 +376,7 @@ Object.defineProperty(exports, 'process', {
// Create a function that will return the specified value when called in browser.
export function createFunctionWithReturnValue<T> (returnValue: T): () => T {
const func = () => returnValue;
v8Util.setHiddenValue(func, 'returnValue', true);
isReturnValue.add(func);
return func;
}