Merge pull request #179 from UnityTech/kgdev

Fix NoAllocHelpers.

Runtime/Unity.UIWidgets.asmdef

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

Runtime/foundation/basic_types.cs

 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Unity.UIWidgets.ui;
+using Unity.UIWidgets.InternalBridge;
 using UnityEngine;
 using Object = UnityEngine.Object;
 
         }
 
         public static void reset<T>(this List<T> list, int size) {
-            NoAllocHelpers<T>.EnsureListElemCount(list, size);
+            NoAllocHelpersBridge<T>.EnsureListElemCount(list, size);
-            var array = NoAllocHelpers<T>.ExtractArrayFromListT(list);
+            var array = NoAllocHelpersBridge<T>.ExtractArrayFromListT(list);
-            return NoAllocHelpers<T>.ExtractArrayFromListT(list);
+            return NoAllocHelpersBridge<T>.ExtractArrayFromListT(list);
         }
     }
 }

Runtime/ui/txt/linebreaker.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
+using Unity.UIWidgets.InternalBridge;
 using UnityEngine;
 
 namespace Unity.UIWidgets.ui {
 
         public void resize(int size) {
             if (this._charWidths.Count < size) {
-                NoAllocHelpers<float>.ResizeList(this._charWidths, size);
+                NoAllocHelpersBridge<float>.ResizeList(this._charWidths, size);
             }
         }
 

Runtime/InternalBridge/NoAllocHelpersBridge.cs.meta

 fileFormatVersion: 2
-guid: 2facb9d73ce7146b9942f8e22d4a04a3
+guid: ae100515a41a04d9f8426e6d7c4b2d04
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Runtime/InternalBridge.meta

+fileFormatVersion: 2
+guid: 6692331a428d6455c97baf446a850594
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Runtime/InternalBridge/InternalBridge.asmdef

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

Runtime/InternalBridge/InternalBridge.asmdef.meta

+fileFormatVersion: 2
+guid: 4c951e9ffe25e41eabcc32758a061e70
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Runtime/InternalBridge/NoAllocHelpersBridge.cs

+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/ui/painting/NoAllocHelpers.cs

-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using UnityEngine;
-
-namespace Unity.UIWidgets.ui {
-    public static class NoAllocHelpers<T> {
-
-        static Func<List<T>, T[]> _extractArrayFromListDelegate;
-
-        static Action<List<T>, int> _resizeListDelegate;
-
-        public static T[] ExtractArrayFromListT(List<T> list) {
-            if (_extractArrayFromListDelegate == null) {
-                var ass = Assembly.GetAssembly(typeof(Mesh));
-                var type = ass.GetType("UnityEngine.NoAllocHelpers");
-                var methodInfo = type.GetMethod(
-                        "ExtractArrayFromListT",
-                        BindingFlags.Static | BindingFlags.Public)
-                    .MakeGenericMethod(typeof(T));
-
-                _extractArrayFromListDelegate = (Func<List<T>, T[]>)
-                    Delegate.CreateDelegate(typeof(Func<List<T>, T[]>), methodInfo);
-            }
-
-            return _extractArrayFromListDelegate(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;
-            }
-
-            if (_resizeListDelegate == null) {
-                var ass = Assembly.GetAssembly(typeof(Mesh)); // any class in UnityEngine
-                var type = ass.GetType("UnityEngine.NoAllocHelpers");
-                var methodInfo = type.GetMethod(
-                        "ResizeList",
-                        BindingFlags.Static | BindingFlags.Public)
-                    .MakeGenericMethod(typeof(T));
-                _resizeListDelegate = (Action<List<T>, int>)
-                    Delegate.CreateDelegate(typeof(Action<List<T>, int>), methodInfo);
-            }
-
-            _resizeListDelegate(list, size);
-        }
-
-        public static void EnsureListElemCount(List<T> list, int size) {
-            list.Clear();
-            if (list.Capacity < size) {
-                list.Capacity = size;
-            }
-
-            ResizeList(list, size);
-        }
-    }
-}