From 96593571eb25ab3f55bb09c8717244a74d771ec1 Mon Sep 17 00:00:00 2001
From: Tim van der Meij <timvandermeij@gmail.com>
Date: Sun, 4 Sep 2016 20:19:31 +0200
Subject: [PATCH] Optimize scale calculation in `text_layer.js`

This patch avoids having to calculate the scale twice by saving it in
the properties object.

Moreover, we remove a temporary variable and place parentheses around a
calculation inside a string concatenation.
---
 src/display/text_layer.js | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/display/text_layer.js b/src/display/text_layer.js
index f1aa9b829..a1e82e0b2 100644
--- a/src/display/text_layer.js
+++ b/src/display/text_layer.js
@@ -67,11 +67,11 @@ var renderTextLayer = (function renderTextLayerClosure() {
       canvasWidth: 0,
       isWhitespace: false,
       originalTransform: '',
-      originalWidth: 0,
       paddingBottom: 0,
       paddingLeft: 0,
       paddingRight: 0,
       paddingTop: 0,
+      scale: 1,
     };
 
     task._textDivs.push(textDiv);
@@ -205,17 +205,15 @@ var renderTextLayer = (function renderTextLayerClosure() {
       }
 
       var width = ctx.measureText(textDiv.textContent).width;
-      textDivProperties.originalWidth = width;
       textLayerFrag.appendChild(textDiv);
 
       var transform = '';
       if (textDivProperties.canvasWidth !== 0 && width > 0) {
-        var scale = textDivProperties.canvasWidth / width;
-        transform = 'scaleX(' + scale + ')';
+        textDivProperties.scale = textDivProperties.canvasWidth / width;
+        transform = 'scaleX(' + textDivProperties.scale + ')';
       }
-      var rotation = textDivProperties.angle;
-      if (rotation !== 0) {
-        transform = 'rotate(' + rotation + 'deg) ' + transform;
+      if (textDivProperties.angle !== 0) {
+        transform = 'rotate(' + textDivProperties.angle + 'deg) ' + transform;
       }
       if (transform !== '') {
         textDivProperties.originalTransform = transform;
@@ -569,21 +567,18 @@ var renderTextLayer = (function renderTextLayerClosure() {
 
         if (expandDivs) {
           var transform = '';
-          var scale = 1;
 
-          if (divProperties.canvasWidth !== 0 &&
-              divProperties.originalWidth > 0) {
-            scale = divProperties.canvasWidth / divProperties.originalWidth;
-            transform = 'scaleX(' + scale + ')';
+          if (divProperties.scale !== 1) {
+            transform = 'scaleX(' + divProperties.scale + ')';
           }
           if (divProperties.angle !== 0) {
             transform = 'rotate(' + divProperties.angle + 'deg) ' + transform;
           }
           if (divProperties.paddingLeft !== 0) {
             div.style.paddingLeft =
-              (divProperties.paddingLeft / scale) + 'px';
+              (divProperties.paddingLeft / divProperties.scale) + 'px';
             transform += ' translateX(' +
-              (-divProperties.paddingLeft / scale) + 'px)';
+              (-divProperties.paddingLeft / divProperties.scale) + 'px)';
           }
           if (divProperties.paddingTop !== 0) {
             div.style.paddingTop = divProperties.paddingTop + 'px';
@@ -591,7 +586,7 @@ var renderTextLayer = (function renderTextLayerClosure() {
           }
           if (divProperties.paddingRight !== 0) {
             div.style.paddingRight =
-              divProperties.paddingRight / scale + 'px';
+              (divProperties.paddingRight / divProperties.scale) + 'px';
           }
           if (divProperties.paddingBottom !== 0) {
             div.style.paddingBottom = divProperties.paddingBottom + 'px';