Fix issues.

Yuncong Zhang · Yuncong Zhang · commit 77d9edb6e61f · 2019-07-18T10:13:58.000+08:00
diff --git a/Runtime/painting/text_painter.cs b/Runtime/painting/text_painter.cs
@@ -34,6 +34,10 @@ public TextPainter(TextSpan text = null,
             this._ellipsis = ellipsis;
         }
 
+        ~TextPainter() {
+            Paragraph.release(ref this._paragraph);
+        }
+
         public float textScaleFactor {
             get { return this._textScaleFactor; }
             set {
diff --git a/Runtime/rendering/editable.cs b/Runtime/rendering/editable.cs
@@ -884,11 +884,11 @@ public TextPosition getParagraphForward(TextPosition position, TextAffinity? aff
             Paragraph.LineRange? line = null;
             for (int i = 0; i < lineCount; ++i) {
                 line = this._textPainter.getLineRange(i);
-                if (!((Paragraph.LineRange) line).hardBreak) {
+                if (!line.Value.hardBreak) {
                     continue;
                 }
 
-                if (((Paragraph.LineRange) line).end > position.offset) {
+                if (line.Value.end > position.offset) {
                     break;
                 }
             }
@@ -897,7 +897,7 @@ public TextPosition getParagraphForward(TextPosition position, TextAffinity? aff
                 return new TextPosition(position.offset, affinity ?? position.affinity);
             }
 
-            return new TextPosition(((Paragraph.LineRange) line).end, affinity ?? position.affinity);
+            return new TextPosition(line.Value.end, affinity ?? position.affinity);
         }
 
 
@@ -911,7 +911,7 @@ public TextPosition getParagraphBackward(TextPosition position, TextAffinity? af
                     continue;
                 }
 
-                if (((Paragraph.LineRange) line).start < position.offset) {
+                if (line.Value.start < position.offset) {
                     break;
                 }
             }
@@ -920,7 +920,7 @@ public TextPosition getParagraphBackward(TextPosition position, TextAffinity? af
                 return new TextPosition(position.offset, affinity ?? position.affinity);
             }
 
-            return new TextPosition(((Paragraph.LineRange) line).start, affinity ?? position.affinity);
+            return new TextPosition(line.Value.start, affinity ?? position.affinity);
         }
 
         protected override float computeMinIntrinsicWidth(float height) {
diff --git a/Runtime/ui/painting/draw_cmd.cs b/Runtime/ui/painting/draw_cmd.cs
@@ -87,7 +87,7 @@ public class DrawPicture : DrawCmd {
     }
 
     public class DrawTextBlob : DrawCmd {
-        public TextBlob textBlob;
+        public TextBlob? textBlob;
         public Offset offset;
         public Paint paint;
     }
diff --git a/Runtime/ui/painting/picture.cs b/Runtime/ui/painting/picture.cs
@@ -268,7 +268,7 @@ public void addDrawCmd(DrawCmd drawCmd) {
                 case DrawTextBlob cmd: {
                     var state = this._getState();
                     var scale = XformUtils.getScale(state.xform);
-                    var rect = cmd.textBlob.shiftedBoundsInText(cmd.offset);
+                    var rect = cmd.textBlob.Value.shiftedBoundsInText(cmd.offset.dx, cmd.offset.dy);
                     rect = state.xform.mapRect(rect);
 
                     var paint = cmd.paint;
diff --git a/Runtime/ui/painting/txt/mesh_generator.cs b/Runtime/ui/painting/txt/mesh_generator.cs
@@ -205,13 +205,13 @@ public uiMeshMesh resolveMesh() {
 
                     var uvRect = EmojiUtils.getUVRect(code);
 
-                    var pos = this.textBlob.getPosition(i);
+                    var positionX = this.textBlob.getPositionX(i);
 
                     int baseIndex = vert.Count;
-                    vert.Add(new Vector3(pos + minX, minY, 0));
-                    vert.Add(new Vector3(pos + maxX, minY, 0));
-                    vert.Add(new Vector3(pos + maxX, maxY, 0));
-                    vert.Add(new Vector3(pos + minX, maxY, 0));
+                    vert.Add(new Vector3(positionX + minX, minY, 0));
+                    vert.Add(new Vector3(positionX + maxX, minY, 0));
+                    vert.Add(new Vector3(positionX + maxX, maxY, 0));
+                    vert.Add(new Vector3(positionX + minX, maxY, 0));
                     tri.Add(baseIndex);
                     tri.Add(baseIndex + 1);
                     tri.Add(baseIndex + 2);
@@ -256,7 +256,7 @@ public uiMeshMesh resolveMesh() {
             for (int charIndex = 0; charIndex < length; ++charIndex) {
                 var ch = text[charIndex + this.textBlob.textOffset];
                 // first char as origin for mesh position 
-                var position = this.textBlob.getPosition(charIndex);
+                var positionX = this.textBlob.getPositionX(charIndex);
                 if (LayoutUtils.isWordSpace(ch) || LayoutUtils.isLineEndSpace(ch) || ch == '\t') {
                     continue;
                 }
@@ -274,10 +274,10 @@ public uiMeshMesh resolveMesh() {
 
                 var baseIndex = vertices.Count;
 
-                vertices.Add(new Vector3(position + minX, minY, 0));
-                vertices.Add(new Vector3(position + maxX, minY, 0));
-                vertices.Add(new Vector3(position + maxX, maxY, 0));
-                vertices.Add(new Vector3(position + minX, maxY, 0));
+                vertices.Add(new Vector3(positionX + minX, minY, 0));
+                vertices.Add(new Vector3(positionX + maxX, minY, 0));
+                vertices.Add(new Vector3(positionX + maxX, maxY, 0));
+                vertices.Add(new Vector3(positionX + minX, maxY, 0));
 
                 triangles.Add(baseIndex);
                 triangles.Add(baseIndex + 1);
diff --git a/Runtime/ui/painting/txt/text_blob.cs b/Runtime/ui/painting/txt/text_blob.cs
@@ -1,9 +1,9 @@
 ﻿namespace Unity.UIWidgets.ui {
     public struct TextBlob {
-        internal TextBlob(string text, int textOffset, int textSize, float[] positions,
+        internal TextBlob(string text, int textOffset, int textSize, float[] positionXs,
             UnityEngine.Rect bounds, TextStyle style) {
             this.instanceId = ++_nextInstanceId;
-            this._positions = positions;
+            this._positionXs = positionXs;
             this.text = text;
             this.textOffset = textOffset;
             this.textSize = textSize;
@@ -15,7 +15,7 @@ internal TextBlob(string text, int textOffset, int textSize, float[] positions,
         public Rect boundsInText {
             get {
                 if (this._boundsInText == null) {
-                    var pos = this.getPosition(0);
+                    var pos = this.getPositionX(0);
                     this._boundsInText = Rect.fromLTWH(this._bounds.xMin + pos, this._bounds.yMin,
                         this._bounds.width, this._bounds.height);
                 }
@@ -24,14 +24,14 @@ public Rect boundsInText {
             }
         }
 
-        public Rect shiftedBoundsInText(Offset offset) {
-            var pos = this.getPosition(0);
-            return Rect.fromLTWH(this._bounds.xMin + pos + offset.dx, this._bounds.yMin + offset.dy,
+        public Rect shiftedBoundsInText(float dx, float dy) {
+            var pos = this.getPositionX(0);
+            return Rect.fromLTWH(this._bounds.xMin + pos + dx, this._bounds.yMin + dy,
                 this._bounds.width, this._bounds.height);
         }
 
-        public float getPosition(int i) {
-            return this._positions[this.textOffset + i];
+        public float getPositionX(int i) {
+            return this._positionXs[this.textOffset + i];
         }
 
         static long _nextInstanceId;
@@ -41,14 +41,14 @@ public float getPosition(int i) {
         internal readonly int textSize;
         internal readonly TextStyle style;
         readonly UnityEngine.Rect _bounds; // bounds with positions[start] as origin       
-        readonly float[] _positions;
+        readonly float[] _positionXs;
 
         Rect _boundsInText;
     }
 
     public struct TextBlobBuilder {
         TextStyle _style;
-        float[] _positions;
+        float[] _positionXs;
         string _text;
         int _textOffset;
         int _size;
@@ -71,17 +71,17 @@ internal void allocRunPos(TextStyle style, string text, int offset, int size) {
         }
 
         internal void allocPos(int size) {
-            if (this._positions == null || this._positions.Length < size) {
-                this._positions = new float[size];
+            if (this._positionXs == null || this._positionXs.Length < size) {
+                this._positionXs = new float[size];
             }
         }
 
-        public void setPosition(int i, float position) {
-            this._positions[this._textOffset + i] = position;
+        public void setPositionX(int i, float positionX) {
+            this._positionXs[this._textOffset + i] = positionX;
         }
 
-        public void setPositions(float[] positions) {
-            this._positions = positions;
+        public void setPositionXs(float[] positionXs) {
+            this._positionXs = positionXs;
         }
 
         public void setBounds(UnityEngine.Rect bounds) {
@@ -90,7 +90,7 @@ public void setBounds(UnityEngine.Rect bounds) {
 
         public TextBlob make() {
             var result = new TextBlob(this._text, this._textOffset,
-                this._size, this._positions, this._bounds, this._style);
+                this._size, this._positionXs, this._bounds, this._style);
             return result;
         }
     }
diff --git a/Runtime/ui/renderer/cmdbufferCanvas/rendering/canvas_impl.cs b/Runtime/ui/renderer/cmdbufferCanvas/rendering/canvas_impl.cs
@@ -928,22 +928,23 @@ void _drawUIPicture(uiPicture picture, bool needsSave = true) {
             }
         }
 
-        void _drawTextBlob(TextBlob textBlob, uiOffset offset, uiPaint paint) {
+        void _drawTextBlob(TextBlob? textBlob, uiOffset offset, uiPaint paint) {
+            D.assert(textBlob != null);
 
             var state = this._currentLayer.currentState;
             var scale = state.scale * this._devicePixelRatio;
 
             var matrix = new uiMatrix3(state.matrix.Value);
             matrix.preTranslate(offset.dx, offset.dy);
 
-            var mesh = TextBlobMesh.create(textBlob, scale, matrix);
-            var textBlobBounds = matrix.mapRect(uiRectHelper.fromRect(textBlob.boundsInText));
+            var mesh = TextBlobMesh.create(textBlob.Value, scale, matrix);
+            var textBlobBounds = matrix.mapRect(uiRectHelper.fromRect(textBlob.Value.boundsInText));
 
             // request font texture so text mesh could be generated correctly
-            var style = textBlob.style;
+            var style = textBlob.Value.style;
             var font = FontManager.instance.getOrCreate(style.fontFamily, style.fontWeight, style.fontStyle).font;
             var fontSizeToLoad = Mathf.CeilToInt(style.UnityFontSize * scale);
-            var subText = textBlob.text.Substring(textBlob.textOffset, textBlob.textSize);
+            var subText = textBlob.Value.text.Substring(textBlob.Value.textOffset, textBlob.Value.textSize);
             Texture tex = null;
             bool notEmoji = !char.IsHighSurrogate(subText[0]) && !EmojiUtils.isSingleCharEmoji(subText[0]);
             if (notEmoji) {
diff --git a/Runtime/ui/renderer/common/draw_cmd.cs b/Runtime/ui/renderer/common/draw_cmd.cs
@@ -405,10 +405,11 @@ public override void release() {
         }
 
         public override void clear() {
+            this.textBlob = null;
             this.offset = null;
         }
 
-        public TextBlob textBlob;
+        public TextBlob? textBlob;
         public uiOffset? offset;
         public uiPaint paint;
     }
diff --git a/Runtime/ui/renderer/common/picture.cs b/Runtime/ui/renderer/common/picture.cs
@@ -261,7 +261,8 @@ public void addDrawCmd(uiDrawCmd drawCmd) {
                 case uiDrawTextBlob cmd: {
                     var state = this._getState();
                     var scale = uiXformUtils.getScale(state.xform);
-                    var rect = uiRectHelper.fromRect(cmd.textBlob.boundsInText).shift(cmd.offset.Value);
+                    var rect = uiRectHelper.fromRect(
+                        cmd.textBlob.Value.shiftedBoundsInText(cmd.offset.Value.dx, cmd.offset.Value.dy));
                     rect = state.xform.mapRect(rect);
 
                     var paint = cmd.paint;
diff --git a/Runtime/ui/txt/paragraph.cs b/Runtime/ui/txt/paragraph.cs
@@ -188,7 +188,7 @@ public LineRange(int start, int end, int endExcludingWhitespace, int endIncludin
         PaintRecord[] _paintRecords;
         CodeUnitRun[] _codeUnitRuns;
         float[] _lineHeights;
-        float[] _textBlobPositions;
+        float[] _textBlobPositionXs;
         float _maxIntrinsicWidth;
         float _minIntrinsicWidth;
         float _alphabeticBaseline;
@@ -333,11 +333,11 @@ public void layout(ParagraphConstraints constraints) {
             int ellipsizedLength = this._text.Length + (this._paragraphStyle.ellipsis?.Length ?? 0);
 
             // All text blobs share a single position buffer, which is big enough taking ellipsis into consideration
-            if (this._textBlobPositions == null || this._textBlobPositions.Length < ellipsizedLength) {
-                this._textBlobPositions = new float[LayoutUtils.minPowerOfTwo(ellipsizedLength)];
+            if (this._textBlobPositionXs == null || this._textBlobPositionXs.Length < ellipsizedLength) {
+                this._textBlobPositionXs = new float[LayoutUtils.minPowerOfTwo(ellipsizedLength)];
             }
 
-            builder.setPositions(this._textBlobPositions);
+            builder.setPositionXs(this._textBlobPositionXs);
             // this._glyphLines and this._codeUnitRuns will refer to this array for glyph positions
             if (this._glyphPositions == null || this._glyphPositions.Length < ellipsizedLength) {
                 this._glyphPositions = new GlyphPosition[LayoutUtils.minPowerOfTwo(ellipsizedLength)];
@@ -467,7 +467,7 @@ public void layout(ParagraphConstraints constraints) {
                             for (int glyphIndex = 0; glyphIndex < textCount; ++glyphIndex) {
                                 float glyphXOffset = _positionsBuffer[glyphIndex] + justifyXOffset;
                                 float glyphAdvance = _advancesBuffer[glyphIndex];
-                                builder.setPosition(glyphIndex, glyphXOffset);
+                                builder.setPositionX(glyphIndex, glyphXOffset);
                                 this._glyphPositions[pGlyphPositions++] = new GlyphPosition(runXOffset + glyphXOffset,
                                     glyphAdvance, textStart + glyphIndex);
                                 if (wordIndex < wordCount) {
diff --git a/Tests/Editor/CanvasAndLayers.cs b/Tests/Editor/CanvasAndLayers.cs
@@ -265,7 +265,7 @@ void drawLine() {
             TextBlobBuilder builder = new TextBlobBuilder();
             string text = "This is a text blob";
             builder.setBounds(new Rect(-10, -20, 200, 50));
-            builder.setPositions(new float[] {
+            builder.setPositionXs(new float[] {
                 10, 20, 30, 40, 50, 60, 70, 80, 90, 100,
                 110, 120, 130, 140, 150, 160, 170, 180, 190
             });

Original file line number	Diff line number	Diff line change
`@@ -884,11 +884,11 @@ public TextPosition getParagraphForward(TextPosition position, TextAffinity? aff`
`884`	`884`	`Paragraph.LineRange? line = null;`
`885`	`885`	`for (int i = 0; i < lineCount; ++i) {`
`886`	`886`	`line = this._textPainter.getLineRange(i);`
`887`		`- if (!((Paragraph.LineRange) line).hardBreak) {`
	`887`	`+ if (!line.Value.hardBreak) {`
`888`	`888`	`continue;`
`889`	`889`	`}`
`890`	`890`
`891`		`- if (((Paragraph.LineRange) line).end > position.offset) {`
	`891`	`+ if (line.Value.end > position.offset) {`
`892`	`892`	`break;`
`893`	`893`	`}`
`894`	`894`	`}`
`@@ -897,7 +897,7 @@ public TextPosition getParagraphForward(TextPosition position, TextAffinity? aff`
`897`	`897`	`return new TextPosition(position.offset, affinity ?? position.affinity);`
`898`	`898`	`}`
`899`	`899`
`900`		`- return new TextPosition(((Paragraph.LineRange) line).end, affinity ?? position.affinity);`
	`900`	`+ return new TextPosition(line.Value.end, affinity ?? position.affinity);`
`901`	`901`	`}`
`902`	`902`
`903`	`903`
`@@ -911,7 +911,7 @@ public TextPosition getParagraphBackward(TextPosition position, TextAffinity? af`
`911`	`911`	`continue;`
`912`	`912`	`}`
`913`	`913`
`914`		`- if (((Paragraph.LineRange) line).start < position.offset) {`
	`914`	`+ if (line.Value.start < position.offset) {`
`915`	`915`	`break;`
`916`	`916`	`}`
`917`	`917`	`}`
`@@ -920,7 +920,7 @@ public TextPosition getParagraphBackward(TextPosition position, TextAffinity? af`
`920`	`920`	`return new TextPosition(position.offset, affinity ?? position.affinity);`
`921`	`921`	`}`
`922`	`922`
`923`		`- return new TextPosition(((Paragraph.LineRange) line).start, affinity ?? position.affinity);`
	`923`	`+ return new TextPosition(line.Value.start, affinity ?? position.affinity);`
`924`	`924`	`}`
`925`	`925`
`926`	`926`	`protected override float computeMinIntrinsicWidth(float height) {`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public class DrawPicture : DrawCmd {`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`public class DrawTextBlob : DrawCmd {`
`90`		`- public TextBlob textBlob;`
	`90`	`+ public TextBlob? textBlob;`
`91`	`91`	`public Offset offset;`
`92`	`92`	`public Paint paint;`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -405,10 +405,11 @@ public override void release() {`
`405`	`405`	`}`
`406`	`406`
`407`	`407`	`public override void clear() {`
	`408`	`+ this.textBlob = null;`
`408`	`409`	`this.offset = null;`
`409`	`410`	`}`
`410`	`411`
`411`		`- public TextBlob textBlob;`
	`412`	`+ public TextBlob? textBlob;`
`412`	`413`	`public uiOffset? offset;`
`413`	`414`	`public uiPaint paint;`
`414`	`415`	`}`