Merge pull request #11090 from Snuffleupagus/textLayer-expandTextDivs…

…-transform [TextLayer] Use an Array to build the total `transform`, rather than concatenating Strings, in `expandTextDivs`
mozilla · Aug 23, 2019 · edbebb8 · edbebb8
2 parents d1ef08e + 37e8a81
commit edbebb8
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/src/display/text_layer.js b/src/display/text_layer.js
@@ -626,6 +626,7 @@ var renderTextLayer = (function renderTextLayerClosure() {
         expand(this);
         this._bounds = null;
       }
+      const transformBuf = [];
 
       for (var i = 0, ii = this._textDivs.length; i < ii; i++) {
         const div = this._textDivs[i];
@@ -635,23 +636,24 @@ var renderTextLayer = (function renderTextLayerClosure() {
           continue;
         }
         if (expandDivs) {
-          let transform = '', padding = '';
+          transformBuf.length = 0;
+          let padding = '';
 
-          if (divProps.scale !== 1) {
-            transform = `scaleX(${divProps.scale})`;
-          }
           if (divProps.angle !== 0) {
-            transform = `rotate(${divProps.angle}deg) ${transform}`;
+            transformBuf.push(`rotate(${divProps.angle}deg)`);
+          }
+          if (divProps.scale !== 1) {
+            transformBuf.push(`scaleX(${divProps.scale})`);
           }
           if (divProps.paddingLeft > 0) {
             padding +=
               ` padding-left: ${divProps.paddingLeft / divProps.scale}px;`;
-            transform +=
-              ` translateX(${-divProps.paddingLeft / divProps.scale}px)`;
+            transformBuf.push(
+              `translateX(${-divProps.paddingLeft / divProps.scale}px)`);
           }
           if (divProps.paddingTop > 0) {
             padding += ` padding-top: ${divProps.paddingTop}px;`;
-            transform += ` translateY(${-divProps.paddingTop}px)`;
+            transformBuf.push(`translateY(${-divProps.paddingTop}px)`);
           }
           if (divProps.paddingRight > 0) {
             padding +=
@@ -664,8 +666,8 @@ var renderTextLayer = (function renderTextLayerClosure() {
           if (padding !== '') {
             div.setAttribute('style', divProps.style + padding);
           }
-          if (transform !== '') {
-            div.style.transform = transform;
+          if (transformBuf.length) {
+            div.style.transform = transformBuf.join(' ');
           }
         } else {
           div.style.padding = null;