avm2: Implement clone() method for flash.text.engine classes

onkrot · torokati44 · commit 255b8ea882c6 · 2025-09-20T18:53:40.000+02:00
diff --git a/core/src/avm2/globals/flash/text/engine/EastAsianJustifier.as b/core/src/avm2/globals/flash/text/engine/EastAsianJustifier.as
@@ -1,8 +1,37 @@
 package flash.text.engine {
     [API("662")]
     public final class EastAsianJustifier extends TextJustifier {
+        private var _justificationStyle:String;
+        private var _composeTrailingIdeographicSpaces:Boolean;
+
         public function EastAsianJustifier(locale:String = "ja", lineJustification:String = "allButLast", justificationStyle:String = "pushInKinsoku") {
             super(locale, lineJustification);
+            this.justificationStyle = justificationStyle;
+        }
+
+        public function get justificationStyle():String {
+            return this._justificationStyle;
+        }
+
+        public function set justificationStyle(value:String):void {
+            // TODO: Validate the argument
+            this._justificationStyle = value;
+        }
+
+        [API("674")]
+        public function get composeTrailingIdeographicSpaces():Boolean {
+            return this._composeTrailingIdeographicSpaces;
+        }
+
+        [API("674")]
+        public function set composeTrailingIdeographicSpaces(value:Boolean):void {
+            this._composeTrailingIdeographicSpaces = value;
+        }
+
+        override public function clone():TextJustifier {
+            var copy = new EastAsianJustifier(this.locale, this.lineJustification, this.justificationStyle);
+            copy.composeTrailingIdeographicSpaces = this.composeTrailingIdeographicSpaces;
+            return copy;
         }
     }
 }
diff --git a/core/src/avm2/globals/flash/text/engine/ElementFormat.as b/core/src/avm2/globals/flash/text/engine/ElementFormat.as
@@ -207,6 +207,17 @@ package flash.text.engine {
             this._typographicCase = value;
         }
 
+        public function clone():ElementFormat {
+            var fd = this.fontDescription ? this.fontDescription.clone() : null;
+            return new ElementFormat(
+                fd, this.fontSize, this.color, this.alpha, this.textRotation,
+                this.dominantBaseline, this.alignmentBaseline, this.baselineShift, this.kerning,
+                this.trackingRight, this.trackingLeft, this.locale, this.breakOpportunity,
+                this.digitCase, this.digitWidth, this.ligatureLevel, this.typographicCase
+            );
+        }
+
+
         public function getFontMetrics():FontMetrics {
             stub_method("flash.text.engine.ElementFormat", "getFontMetrics");
             var emBox:Rectangle = new Rectangle(0, _fontSize * -0.8, _fontSize, _fontSize);
diff --git a/core/src/avm2/globals/flash/text/engine/FontDescription.as b/core/src/avm2/globals/flash/text/engine/FontDescription.as
@@ -1,5 +1,7 @@
 package flash.text.engine {
     import __ruffle__.stub_method;
+    import __ruffle__.stub_getter;
+    import __ruffle__.stub_setter;
 
     [API("662")]
     public final class FontDescription {
@@ -19,6 +21,8 @@ package flash.text.engine {
 
         private var _cffHinting:String;
 
+        private var _locked:Boolean;
+
         public function FontDescription(fontName:String = "_serif", fontWeight:String = "normal", fontPosture:String = "normal",
                                         fontLookup:String = "device", renderingMode:String = "cff", cffHinting:String = "horizontalStem") {
             this.fontName = fontName;
@@ -104,6 +108,23 @@ package flash.text.engine {
             this._cffHinting = value;
         }
 
+        public function get locked():Boolean {
+            stub_getter("flash.text.engine.FontDescription", "locked");
+            return this._locked;
+        }
+
+        public function set locked(locked:Boolean):void {
+            stub_setter("flash.text.engine.FontDescription", "locked");
+            this._locked = locked;
+        }
+
+        public function clone():FontDescription {
+            return new FontDescription(
+                this.fontName, this.fontWeight, this.fontPosture,
+                this.fontLookup, this.renderingMode, this.cffHinting
+            );
+        }
+
         public static function isFontCompatible(fontName: String, fontWeight: String, fontPosture: String): Boolean {
             stub_method("flash.text.engine.FontDescription", "isFontCompatible");
             return false;
diff --git a/core/src/avm2/globals/flash/text/engine/SpaceJustifier.as b/core/src/avm2/globals/flash/text/engine/SpaceJustifier.as
@@ -42,5 +42,13 @@ package flash.text.engine {
         public function set optimumSpacing(value:Number):void {
             this._optimumSpacing = value;
         }
+
+        override public function clone():TextJustifier {
+            var copy = new SpaceJustifier(this.locale, this.lineJustification, this.letterSpacing);
+            copy.minimumSpacing = this.minimumSpacing;
+            copy.maximumSpacing = this.maximumSpacing;
+            copy.optimumSpacing = this.optimumSpacing;
+            return copy;
+        }
     }
 }
diff --git a/core/src/avm2/globals/flash/text/engine/TextJustifier.as b/core/src/avm2/globals/flash/text/engine/TextJustifier.as
@@ -1,15 +1,21 @@
 package flash.text.engine {
     import flash.utils.getQualifiedClassName;
+    import __ruffle__.stub_getter;
+    import __ruffle__.stub_setter;
+
 
     [API("662")]
     public class TextJustifier {
         private var _lineJustification:String = null;
+        private var _locale:String = "en";
         public function TextJustifier(locale:String, lineJustification:String) {
             // TODO: Is there a better way to do this?
             if (getQualifiedClassName(this) === "flash.text.engine::TextJustifier") {
                 throw new ArgumentError("Error #2012: TextJustifier$ class cannot be instantiated.", 2012);
             }
 
+            // TODO: Validate locale
+            this._locale = locale;
             this.lineJustification = lineJustification;
         }
 
@@ -21,6 +27,11 @@ package flash.text.engine {
             this._lineJustification = value;
         }
 
+        public function get locale():String {
+            stub_getter("flash.text.engine.TextJustifier", "locale");
+            return this._locale;
+        }
+
         public function clone():TextJustifier {
             return null;
         }
diff --git a/tests/tests/swfs/avm2/east_asian_justifier_clone/Test.as b/tests/tests/swfs/avm2/east_asian_justifier_clone/Test.as
@@ -0,0 +1,22 @@
+// mxmlc -o test.swf -debug Test.as
+package {
+    import flash.display.MovieClip;
+    public class Test extends MovieClip {
+        public function Test() {
+        }
+    }
+}
+
+import flash.text.engine.EastAsianJustifier;
+var eaj:EastAsianJustifier = new EastAsianJustifier();
+
+var eaj2:EastAsianJustifier = eaj.clone() as EastAsianJustifier;
+
+trace("trace(eaj.locale == eaj2.locale);");
+trace(eaj.locale == eaj2.locale);
+trace("trace(eaj.lineJustification == eaj2.lineJustification);");
+trace(eaj.lineJustification == eaj2.lineJustification);
+trace("trace(eaj.justificationStyle == eaj2.justificationStyle);");
+trace(eaj.justificationStyle == eaj2.justificationStyle);
+trace("trace(eaj.composeTrailingIdeographicSpaces == eaj2.composeTrailingIdeographicSpaces);");
+trace(eaj.composeTrailingIdeographicSpaces == eaj2.composeTrailingIdeographicSpaces);
diff --git a/tests/tests/swfs/avm2/east_asian_justifier_clone/output.txt b/tests/tests/swfs/avm2/east_asian_justifier_clone/output.txt
@@ -0,0 +1,8 @@
+trace(eaj.locale == eaj2.locale);
+true
+trace(eaj.lineJustification == eaj2.lineJustification);
+true
+trace(eaj.justificationStyle == eaj2.justificationStyle);
+true
+trace(eaj.composeTrailingIdeographicSpaces == eaj2.composeTrailingIdeographicSpaces);
+true
diff --git a/tests/tests/swfs/avm2/east_asian_justifier_clone/test.swf b/tests/tests/swfs/avm2/east_asian_justifier_clone/test.swf
diff --git a/tests/tests/swfs/avm2/east_asian_justifier_clone/test.toml b/tests/tests/swfs/avm2/east_asian_justifier_clone/test.toml
@@ -0,0 +1 @@
+num_frames = 1
diff --git a/tests/tests/swfs/avm2/element_format_clone/Test.as b/tests/tests/swfs/avm2/element_format_clone/Test.as
@@ -0,0 +1,60 @@
+// mxmlc -o test.swf -debug Test.as
+package {
+    import flash.display.MovieClip;
+    public class Test extends MovieClip {
+        public function Test() {
+        }
+    }
+}
+
+import flash.text.engine.FontDescription;
+import flash.text.engine.ElementFormat;
+var ef:ElementFormat = new ElementFormat(new FontDescription());
+
+var ef2:ElementFormat = ef.clone();
+
+trace("trace(ef.fontDescription.fontName == ef2.fontDescription.fontName);");
+trace(ef.fontDescription.fontName == ef2.fontDescription.fontName);
+trace("trace(ef.fontDescription.fontWeight == ef2.fontDescription.fontWeight);");
+trace(ef.fontDescription.fontWeight == ef2.fontDescription.fontWeight);
+trace("trace(ef.fontDescription.fontPosture == ef2.fontDescription.fontPosture);");
+trace(ef.fontDescription.fontPosture == ef2.fontDescription.fontPosture);
+trace("trace(ef.fontDescription.fontLookup == ef2.fontDescription.fontLookup);");
+trace(ef.fontDescription.fontLookup == ef2.fontDescription.fontLookup);
+trace("trace(ef.fontDescription.renderingMode == ef2.fontDescription.renderingMode);");
+trace(ef.fontDescription.renderingMode == ef2.fontDescription.renderingMode);
+trace("trace(ef.fontDescription.cffHinting == ef2.fontDescription.cffHinting);");
+trace(ef.fontDescription.cffHinting == ef2.fontDescription.cffHinting);
+
+trace("trace(ef.fontSize == ef2.fontSize);");
+trace(ef.fontSize == ef2.fontSize);
+trace("trace(ef.color == ef2.color);");
+trace(ef.color == ef2.color);
+trace("trace(ef.alpha == ef2.alpha);");
+trace(ef.alpha == ef2.alpha);
+trace("trace(ef.textRotation == ef2.textRotation);");
+trace(ef.textRotation == ef2.textRotation);
+trace("trace(ef.dominantBaseline == ef2.dominantBaseline);");
+trace(ef.dominantBaseline == ef2.dominantBaseline);
+trace("trace(ef.alignmentBaseline == ef2.alignmentBaseline);");
+trace(ef.alignmentBaseline == ef2.alignmentBaseline);
+trace("trace(ef.baselineShift == ef2.baselineShift);");
+trace(ef.baselineShift == ef2.baselineShift);
+trace("trace(ef.kerning == ef2.kerning);");
+trace(ef.kerning == ef2.kerning);
+trace("trace(ef.trackingRight == ef2.trackingRight);");
+trace(ef.trackingRight == ef2.trackingRight);
+trace("trace(ef.trackingLeft == ef2.trackingLeft);");
+trace(ef.trackingLeft == ef2.trackingLeft);
+trace("trace(ef.locale == ef2.locale);");
+trace(ef.locale == ef2.locale);
+trace("trace(ef.breakOpportunity == ef2.breakOpportunity);");
+trace(ef.breakOpportunity == ef2.breakOpportunity);
+trace("trace(ef.digitCase == ef2.digitCase);");
+trace(ef.digitCase == ef2.digitCase);
+trace("trace(ef.digitWidth == ef2.digitWidth);");
+trace(ef.digitWidth == ef2.digitWidth);
+trace("trace(ef.ligatureLevel == ef2.ligatureLevel);");
+trace(ef.ligatureLevel == ef2.ligatureLevel);
+trace("trace(ef.typographicCase == ef2.typographicCase);");
+trace(ef.typographicCase == ef2.typographicCase);
diff --git a/tests/tests/swfs/avm2/element_format_clone/output.txt b/tests/tests/swfs/avm2/element_format_clone/output.txt
@@ -0,0 +1,44 @@
+trace(ef.fontDescription.fontName == ef2.fontDescription.fontName);
+true
+trace(ef.fontDescription.fontWeight == ef2.fontDescription.fontWeight);
+true
+trace(ef.fontDescription.fontPosture == ef2.fontDescription.fontPosture);
+true
+trace(ef.fontDescription.fontLookup == ef2.fontDescription.fontLookup);
+true
+trace(ef.fontDescription.renderingMode == ef2.fontDescription.renderingMode);
+true
+trace(ef.fontDescription.cffHinting == ef2.fontDescription.cffHinting);
+true
+trace(ef.fontSize == ef2.fontSize);
+true
+trace(ef.color == ef2.color);
+true
+trace(ef.alpha == ef2.alpha);
+true
+trace(ef.textRotation == ef2.textRotation);
+true
+trace(ef.dominantBaseline == ef2.dominantBaseline);
+true
+trace(ef.alignmentBaseline == ef2.alignmentBaseline);
+true
+trace(ef.baselineShift == ef2.baselineShift);
+true
+trace(ef.kerning == ef2.kerning);
+true
+trace(ef.trackingRight == ef2.trackingRight);
+true
+trace(ef.trackingLeft == ef2.trackingLeft);
+true
+trace(ef.locale == ef2.locale);
+true
+trace(ef.breakOpportunity == ef2.breakOpportunity);
+true
+trace(ef.digitCase == ef2.digitCase);
+true
+trace(ef.digitWidth == ef2.digitWidth);
+true
+trace(ef.ligatureLevel == ef2.ligatureLevel);
+true
+trace(ef.typographicCase == ef2.typographicCase);
+true
diff --git a/tests/tests/swfs/avm2/element_format_clone/test.swf b/tests/tests/swfs/avm2/element_format_clone/test.swf
diff --git a/tests/tests/swfs/avm2/element_format_clone/test.toml b/tests/tests/swfs/avm2/element_format_clone/test.toml
@@ -0,0 +1 @@
+num_frames = 1
diff --git a/tests/tests/swfs/avm2/font_description_clone/Test.as b/tests/tests/swfs/avm2/font_description_clone/Test.as
@@ -0,0 +1,29 @@
+// mxmlc -o test.swf -debug Test.as
+package {
+    import flash.display.MovieClip;
+    public class Test extends MovieClip {
+        public function Test() {
+        }
+    }
+}
+
+import flash.text.engine.FontDescription;
+var fd:FontDescription = new FontDescription();
+fd.locked = true;
+
+var fd2:FontDescription = fd.clone();
+
+trace("trace(fd.fontName == fd2.fontName);");
+trace(fd.fontName == fd2.fontName);
+trace("trace(fd.fontWeight == fd2.fontWeight);");
+trace(fd.fontWeight == fd2.fontWeight);
+trace("trace(fd.fontPosture == fd2.fontPosture);");
+trace(fd.fontPosture == fd2.fontPosture);
+trace("trace(fd.fontLookup == fd2.fontLookup);");
+trace(fd.fontLookup == fd2.fontLookup);
+trace("trace(fd.renderingMode == fd2.renderingMode);");
+trace(fd.renderingMode == fd2.renderingMode);
+trace("trace(fd.cffHinting == fd2.cffHinting);");
+trace(fd.cffHinting == fd2.cffHinting);
+trace("trace(fd.locked == fd2.locked);");
+trace(fd.locked == fd2.locked);
diff --git a/tests/tests/swfs/avm2/font_description_clone/output.txt b/tests/tests/swfs/avm2/font_description_clone/output.txt
@@ -0,0 +1,14 @@
+trace(fd.fontName == fd2.fontName);
+true
+trace(fd.fontWeight == fd2.fontWeight);
+true
+trace(fd.fontPosture == fd2.fontPosture);
+true
+trace(fd.fontLookup == fd2.fontLookup);
+true
+trace(fd.renderingMode == fd2.renderingMode);
+true
+trace(fd.cffHinting == fd2.cffHinting);
+true
+trace(fd.locked == fd2.locked);
+false
diff --git a/tests/tests/swfs/avm2/font_description_clone/test.swf b/tests/tests/swfs/avm2/font_description_clone/test.swf
diff --git a/tests/tests/swfs/avm2/font_description_clone/test.toml b/tests/tests/swfs/avm2/font_description_clone/test.toml
@@ -0,0 +1 @@
+num_frames = 1
diff --git a/tests/tests/swfs/avm2/space_justifier_clone/Test.as b/tests/tests/swfs/avm2/space_justifier_clone/Test.as
@@ -0,0 +1,29 @@
+// mxmlc -o test.swf -debug Test.as
+package {
+    import flash.display.MovieClip;
+    public class Test extends MovieClip {
+        public function Test() {
+        }
+    }
+}
+
+import flash.text.engine.SpaceJustifier;
+var sj:SpaceJustifier = new SpaceJustifier();
+sj.minimumSpacing = 1;
+sj.maximumSpacing = 2;
+sj.optimumSpacing = 1;
+
+var sj2:SpaceJustifier = sj.clone() as SpaceJustifier;
+
+trace("trace(sj.locale == sj2.locale);");
+trace(sj.locale == sj2.locale);
+trace("trace(sj.lineJustification == sj2.lineJustification);");
+trace(sj.lineJustification == sj2.lineJustification);
+trace("trace(sj.letterSpacing == sj2.letterSpacing);");
+trace(sj.letterSpacing == sj2.letterSpacing);
+trace("trace(sj.minimumSpacing == sj2.minimumSpacing);");
+trace(sj.minimumSpacing == sj2.minimumSpacing);
+trace("trace(sj.maximumSpacing == sj2.maximumSpacing);");
+trace(sj.maximumSpacing == sj2.maximumSpacing);
+trace("trace(sj.optimumSpacing == sj2.optimumSpacing);");
+trace(sj.optimumSpacing == sj2.optimumSpacing);
diff --git a/tests/tests/swfs/avm2/space_justifier_clone/output.txt b/tests/tests/swfs/avm2/space_justifier_clone/output.txt
@@ -0,0 +1,12 @@
+trace(sj.locale == sj2.locale);
+true
+trace(sj.lineJustification == sj2.lineJustification);
+true
+trace(sj.letterSpacing == sj2.letterSpacing);
+true
+trace(sj.minimumSpacing == sj2.minimumSpacing);
+true
+trace(sj.maximumSpacing == sj2.maximumSpacing);
+true
+trace(sj.optimumSpacing == sj2.optimumSpacing);
+true
diff --git a/tests/tests/swfs/avm2/space_justifier_clone/test.swf b/tests/tests/swfs/avm2/space_justifier_clone/test.swf
diff --git a/tests/tests/swfs/avm2/space_justifier_clone/test.toml b/tests/tests/swfs/avm2/space_justifier_clone/test.toml
@@ -0,0 +1 @@
+num_frames = 1

Original file line number	Diff line number	Diff line change
`@@ -42,5 +42,13 @@ package flash.text.engine {`
`42`	`42`	`public function set optimumSpacing(value:Number):void {`
`43`	`43`	`this._optimumSpacing = value;`
`44`	`44`	`}`
	`45`	`+`
	`46`	`+ override public function clone():TextJustifier {`
	`47`	`+ var copy = new SpaceJustifier(this.locale, this.lineJustification, this.letterSpacing);`
	`48`	`+ copy.minimumSpacing = this.minimumSpacing;`
	`49`	`+ copy.maximumSpacing = this.maximumSpacing;`
	`50`	`+ copy.optimumSpacing = this.optimumSpacing;`
	`51`	`+ return copy;`
	`52`	`+ }`
`45`	`53`	`}`
`46`	`54`	`}`