Merge pull request #179 from Unity-Technologies/zgh/build_scripts

fix: app crash because of animating gif

Author: zhuxingwei

com.unity.uiwidgets/Runtime/painting/image_stream.cs

@@ -444,6 +444,7 @@ void _handleAppFrame(TimeSpan timestamp) {
                 _emitFrame(new ImageInfo(image: _nextFrame.image, scale: _scale));
                 _shownTimestamp = timestamp;
                 _frameDuration = _nextFrame.duration;
+                _nextFrame.DisposeCPtr();
                 _nextFrame = null;
                 int completedCycles = _codec.frameCount == 0 ? 0 : _framesEmitted / _codec.frameCount;
 

com.unity.uiwidgets/Runtime/rendering/image.cs

@@ -64,7 +64,9 @@ public Image image {
                 if (value == _image) {
                     return;
                 }
-
+                if(_image != null){
+                    _image.DisposeCPtr();
+                }
                 _image = value;
                 markNeedsPaint();
                 if (_width == null || _height == null) {

com.unity.uiwidgets/Runtime/rendering/layer.cs

@@ -59,6 +59,13 @@ public abstract class Layer : AbstractNodeMixinDiagnosticableTree {
             get { return (ContainerLayer) base.parent; }
         }
 
+        public virtual void DisposeCPtr()
+        {
+            if(_engineLayer != null) {
+                _engineLayer.DisposeCPtr();
+            }
+        }
+
         public bool _needsAddToScene = true;
 
         protected void markNeedsAddToScene() {
@@ -98,6 +105,9 @@ bool  debugSubtreeNeedsAddToScene {
         protected EngineLayer engineLayer {
             get { return _engineLayer; }
             set {
+                if(_engineLayer != null){
+                    _engineLayer.DisposeCPtr();
+                }
                 _engineLayer = value;
                 if (!alwaysNeedsAddToScene) {
                     if (parent != null && !parent.alwaysNeedsAddToScene) {
@@ -244,6 +254,14 @@ public PictureLayer(Rect canvasBounds) {
             this.canvasBounds = canvasBounds;
         }
 
+        public override void DisposeCPtr()
+        {
+            base.DisposeCPtr();
+            if(_picture != null){
+                 _picture.DisposeCPtr();
+            }
+        }
+
         public readonly Rect canvasBounds;
 
         Picture _picture;
@@ -486,6 +504,16 @@ protected List<PictureLayer> _debugCheckElevations() {
             return addedLayers;
         }
 
+        public override void DisposeCPtr() {
+            base.DisposeCPtr();
+            Layer child = firstChild;
+            while (child != null) {
+                Layer next = child.nextSibling;
+                child.DisposeCPtr();
+                child = next;
+            }
+        }
+
         internal override void updateSubtreeNeedsAddToScene() {
             base.updateSubtreeNeedsAddToScene();
             Layer child = firstChild;
@@ -612,6 +640,7 @@ public void removeAllChildren() {
                 child._nextSibling = null;
                 D.assert(child.attached == attached);
                 dropChild(child);
+                child.DisposeCPtr();
                 child = next;
             }
 

com.unity.uiwidgets/Runtime/rendering/view.cs

@@ -134,7 +134,7 @@ public void compositeFrame() {
             using (var scene = layer.buildScene(builder)) {
                 Window.instance.render(scene);
             }
-
+            builder.DisposeCPtr();
             D.assert(() => {
                 if (D.debugRepaintRainbowEnabled || D.debugRepaintTextRainbowEnabled) {
                     D.debugCurrentRepaintColor =

com.unity.uiwidgets/Runtime/ui/compositing.cs

@@ -140,11 +140,11 @@ internal PhysicalShapeEngineLayer(IntPtr ptr) : base(ptr) {
         }
     }
 
-    public class SceneBuilder : NativeWrapper {
+    public class SceneBuilder : NativeWrapperCPtrDisposable {
         public SceneBuilder() : base(SceneBuilder_constructor()) {
         }
 
-        public override void DisposePtr(IntPtr ptr) {
+        public override void DisposeCPtrImpl(IntPtr ptr) {
             SceneBuilder_dispose(ptr);
         }
 

com.unity.uiwidgets/Runtime/ui/native_bindings.cs

@@ -64,4 +64,36 @@ public void Dispose() {
             _dispose();
         }
     }
+
+    /// <summary>
+    /// This class is used to release c++ resources in advance without waiting for c# garbage collection. 
+    /// Please make sure that the resource will not be used again after it is released.
+    /// Releasing resources prematurely may cause null pointer exceptions in references elsewhere.
+    ///
+    /// Usage: 
+    ///    Use DisposeCPtr() to manually release c++ resources, and then add an interface to release unmanaged memory 
+    ///    in DisposeCPtrImpl(IntPtr ptr).
+    /// </summary>
+    public abstract class NativeWrapperCPtrDisposable : NativeWrapperDisposable {
+        public bool isDisposed = false;
+
+        protected NativeWrapperCPtrDisposable() {
+        }
+
+        protected NativeWrapperCPtrDisposable(IntPtr ptr) : base(ptr) {
+        }
+
+        public void DisposeCPtr() {
+            DisposePtr(_ptr);
+        }
+        public override void DisposePtr(IntPtr ptr) {
+            if(isDisposed){
+                return;
+            }
+            isDisposed = true;
+            DisposeCPtrImpl(ptr); 
+        }
+
+        public abstract void DisposeCPtrImpl(IntPtr ptr);
+    }
 }

com.unity.uiwidgets/Runtime/ui/painting.cs

@@ -763,12 +763,13 @@ internal _ImageInfo(int width, int height, int format, int? rowBytes = null) {
         public int rowBytes;
     }
 
-    public class Image : NativeWrapperDisposable, IEquatable<Image> {
+    public class Image : NativeWrapperCPtrDisposable, IEquatable<Image> {
+
         internal Image(IntPtr ptr) : base(ptr) {
         }
 
-        public override void DisposePtr(IntPtr ptr) {
-            Image_dispose(ptr);
+        public override void DisposeCPtrImpl(IntPtr ptr) {
+            Image_dispose(ptr); 
         }
 
         public int width => Image_width(_ptr);
@@ -880,18 +881,31 @@ public override int GetHashCode() {
 
     public delegate void ImageDecoderCallback(Image result);
 
-    public class FrameInfo : NativeWrapper {
+    public class FrameInfo : NativeWrapperCPtrDisposable {
+        
         internal FrameInfo(IntPtr ptr) : base(ptr) {
         }
 
-        public override void DisposePtr(IntPtr ptr) {
+        public override void DisposeCPtrImpl(IntPtr ptr) {
             FrameInfo_dispose(ptr);
         }
 
+
         public TimeSpan duration => TimeSpan.FromMilliseconds(_durationMillis);
         int _durationMillis => FrameInfo_durationMillis(_ptr);
 
-        public Image image => new Image(FrameInfo_image(_ptr));
+        
+        private Image _image;
+
+        public Image image {
+            get {
+                if(_image == null){
+                    _image = new Image(FrameInfo_image(_ptr));
+                }
+                
+                return _image;
+            }
+        }
 
         [DllImport(NativeBindings.dllName)]
         static extern void FrameInfo_dispose(IntPtr ptr);
@@ -1055,11 +1069,11 @@ public enum PathOperation {
         reverseDifference,
     }
 
-    public abstract class EngineLayer : NativeWrapper {
+    public abstract class EngineLayer : NativeWrapperCPtrDisposable {
         protected EngineLayer(IntPtr ptr) : base(ptr) {
         }
 
-        public override void DisposePtr(IntPtr ptr) {
+        public override void DisposeCPtrImpl(IntPtr ptr) {
             EngineLayer_dispose(ptr);
         }
 
@@ -2844,11 +2858,12 @@ static extern void Canvas_drawShadow(IntPtr ptr, IntPtr path, uint color, float
             bool transparentOccluder);
     }
 
-    public class Picture : NativeWrapperDisposable {
+    public class Picture : NativeWrapperCPtrDisposable {
+
         internal Picture(IntPtr ptr) : base(ptr) {
         }
 
-        public override void DisposePtr(IntPtr ptr) {
+        public override void DisposeCPtrImpl(IntPtr ptr) {
             Picture_dispose(ptr);
         }
 

com.unity.uiwidgets/Runtime/widgets/widget_inspector.cs

@@ -2444,6 +2444,12 @@ Rect targetRect
         }
 
 
+        public override void DisposeCPtr() {
+            if(_picture != null){
+                _picture.DisposeCPtr();
+            }
+        }
+
         public override bool findAnnotations<S>(
             AnnotationResult<S> result,
             Offset localPosition,