Merge pull request #179 from UnityTech/kgdev

Fix NoAllocHelpers.

Author: kgdev

Runtime/InternalBridge.meta

@@ -0,0 +1,12 @@
+{
+    "name": "Unity.InternalAPIEngineBridge.024",
+    "references": [],
+    "optionalUnityReferences": [],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": []
+}

Runtime/InternalBridge/InternalBridge.asmdef

@@ -0,0 +1,35 @@
+using System.Collections.Generic;
+
+namespace Unity.UIWidgets.InternalBridge {
+    public static class NoAllocHelpersBridge<T> {
+        public static T[] ExtractArrayFromListT(List<T> list) {
+            return UnityEngine.NoAllocHelpers.ExtractArrayFromListT(list);
+        }
+
+        public static void ResizeList(List<T> list, int size) {
+            if (size < list.Count) {
+                list.RemoveRange(size, list.Count - size);
+                return;
+            }
+
+            if (size == list.Count) {
+                return;
+            }
+
+            if (list.Capacity < size) {
+                list.Capacity = size;
+            }
+
+            UnityEngine.NoAllocHelpers.ResizeList(list, size);
+        }
+
+        public static void EnsureListElemCount(List<T> list, int size) {
+            list.Clear();
+            if (list.Capacity < size) {
+                list.Capacity = size;
+            }
+
+            ResizeList(list, size);
+        }
+    }
+}

Runtime/InternalBridge/InternalBridge.asmdef.meta

@@ -1,6 +1,8 @@
 {
     "name": "Unity.UIWidgets",
-    "references": [],
+    "references": [
+        "Unity.InternalAPIEngineBridge.024"
+    ],
     "optionalUnityReferences": [],
     "includePlatforms": [],
     "excludePlatforms": [],

Runtime/InternalBridge/NoAllocHelpersBridge.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Unity.UIWidgets.ui;
+using Unity.UIWidgets.InternalBridge;
 using UnityEngine;
 using Object = UnityEngine.Object;
 
@@ -135,16 +135,16 @@ public static string toStringList<T>(this IList<T> it) {
         }
 
         public static void reset<T>(this List<T> list, int size) {
-            NoAllocHelpers<T>.EnsureListElemCount(list, size);
+            NoAllocHelpersBridge<T>.EnsureListElemCount(list, size);
         }
 
         public static ref T refAt<T>(this List<T> list, int index) {
-            var array = NoAllocHelpers<T>.ExtractArrayFromListT(list);
+            var array = NoAllocHelpersBridge<T>.ExtractArrayFromListT(list);
             return ref array[index];
         }
 
         public static T[] array<T>(this List<T> list) {
-            return NoAllocHelpers<T>.ExtractArrayFromListT(list);
+            return NoAllocHelpersBridge<T>.ExtractArrayFromListT(list);
         }
     }
 }

Runtime/ui/painting/NoAllocHelpers.cs.meta renamed to Runtime/InternalBridge/NoAllocHelpersBridge.cs.meta

@@ -1,6 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
+using Unity.UIWidgets.InternalBridge;
 using UnityEngine;
 
 namespace Unity.UIWidgets.ui {
@@ -103,7 +102,7 @@ public List<int> getBreaks() {
 
         public void resize(int size) {
             if (this._charWidths.Count < size) {
-                NoAllocHelpers<float>.ResizeList(this._charWidths, size);
+                NoAllocHelpersBridge<float>.ResizeList(this._charWidths, size);
             }
         }