rename JSHostImplementation.ThreadCsOwnedObjects

(used to be CsOwnedObjects) Rename to make it clear that it's objects owned by the current thread, not the runtime globally
dotnet · Apr 28, 2023 · e22ca46 · e22ca46
1 parent 4671e03
commit e22ca46
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/...ervices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Interop/LegacyExports.cs b/...ervices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Interop/LegacyExports.cs
@@ -32,7 +32,7 @@ internal static void PreventTrimming()
 
         public static void GetCSOwnedObjectByJSHandleRef(nint jsHandle, int shouldAddInflight, out JSObject? result)
         {
-            if (JSHostImplementation.CsOwnedObjects.TryGetValue((int)jsHandle, out WeakReference<JSObject>? reference))
+            if (JSHostImplementation.ThreadCsOwnedObjects.TryGetValue((int)jsHandle, out WeakReference<JSObject>? reference))
             {
                 reference.TryGetTarget(out JSObject? jsObject);
                 if (shouldAddInflight != 0)
@@ -74,7 +74,7 @@ public static void CreateCSOwnedProxyRef(nint jsHandle, LegacyHostImplementation
 
             JSObject? res = null;
 
-            if (!JSHostImplementation.CsOwnedObjects.TryGetValue((int)jsHandle, out WeakReference<JSObject>? reference) ||
+            if (!JSHostImplementation.ThreadCsOwnedObjects.TryGetValue((int)jsHandle, out WeakReference<JSObject>? reference) ||
                 !reference.TryGetTarget(out res) ||
                 res.IsDisposed)
             {
@@ -90,7 +90,7 @@ public static void CreateCSOwnedProxyRef(nint jsHandle, LegacyHostImplementation
                         _ => throw new ArgumentOutOfRangeException(nameof(mappedType))
                     };
 #pragma warning restore CS0612 // Type or member is obsolete
-                JSHostImplementation.CsOwnedObjects[(int)jsHandle] = new WeakReference<JSObject>(res, trackResurrection: true);
+                JSHostImplementation.ThreadCsOwnedObjects[(int)jsHandle] = new WeakReference<JSObject>(res, trackResurrection: true);
             }
             if (shouldAddInflight != 0)
             {

diff --git a/...Services.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSHostImplementation.cs b/...Services.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSHostImplementation.cs
@@ -20,7 +20,7 @@ internal static partial class JSHostImplementation
 #endif
         private static Dictionary<int, WeakReference<JSObject>>? s_csOwnedObjects;
 
-        public static Dictionary<int, WeakReference<JSObject>> CsOwnedObjects
+        public static Dictionary<int, WeakReference<JSObject>> ThreadCsOwnedObjects
         {
             get
             {
@@ -37,7 +37,7 @@ public static void ReleaseCSOwnedObject(nint jsHandle)
         {
             if (jsHandle != IntPtr.Zero)
             {
-                CsOwnedObjects.Remove((int)jsHandle);
+                ThreadCsOwnedObjects.Remove((int)jsHandle);
                 Interop.Runtime.ReleaseCSOwnedObject(jsHandle);
             }
         }
@@ -187,12 +187,12 @@ public static JSObject CreateCSOwnedProxy(nint jsHandle)
         {
             JSObject? res;
 
-            if (!CsOwnedObjects.TryGetValue((int)jsHandle, out WeakReference<JSObject>? reference) ||
+            if (!ThreadCsOwnedObjects.TryGetValue((int)jsHandle, out WeakReference<JSObject>? reference) ||
                 !reference.TryGetTarget(out res) ||
                 res.IsDisposed)
             {
                 res = new JSObject(jsHandle);
-                CsOwnedObjects[(int)jsHandle] = new WeakReference<JSObject>(res, trackResurrection: true);
+                ThreadCsOwnedObjects[(int)jsHandle] = new WeakReference<JSObject>(res, trackResurrection: true);
             }
             return res;
         }

diff --git a/...vaScript/src/System/Runtime/InteropServices/JavaScript/Legacy/LegacyHostImplementation.cs b/...vaScript/src/System/Runtime/InteropServices/JavaScript/Legacy/LegacyHostImplementation.cs
@@ -21,7 +21,7 @@ public static void ReleaseInFlight(object obj)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static void RegisterCSOwnedObject(JSObject proxy)
         {
-            JSHostImplementation.CsOwnedObjects[(int)proxy.JSHandle] = new WeakReference<JSObject>(proxy, trackResurrection: true);
+            JSHostImplementation.ThreadCsOwnedObjects[(int)proxy.JSHandle] = new WeakReference<JSObject>(proxy, trackResurrection: true);
         }
 
         public static MarshalType GetMarshalTypeFromType(Type type)