Merge pull request #3494 from SSk123/master

Fixing the offset of vertical CJK text

src/canvas.js

@@ -1199,11 +1199,8 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
       if (textSelection) {
         geom.canvasWidth = canvasWidth;
         if (vertical) {
-          var vmetric = font.defaultVMetrics;
+          var VERTICAL_TEXT_ROTATION = Math.PI / 2;
-          geom.x += vmetric[1] * fontSize * current.fontMatrix[0] /
+          geom.angle += VERTICAL_TEXT_ROTATION;
-                    fontSizeScale * geom.hScale;
-          geom.y += vmetric[2] * fontSize * current.fontMatrix[0] /
-                    fontSizeScale * geom.vScale;
         }
         this.textLayer.appendText(geom);
       }
@@ -1259,12 +1256,8 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
       if (textSelection) {
         geom.canvasWidth = canvasWidth;
         if (vertical) {
-          var fontSizeScale = current.fontSizeScale;
+          var VERTICAL_TEXT_ROTATION = Math.PI / 2;
-          var vmetric = font.defaultVMetrics;
+          geom.angle += VERTICAL_TEXT_ROTATION;
-          geom.x += vmetric[1] * fontSize * current.fontMatrix[0] /
-                    fontSizeScale * geom.hScale;
-          geom.y += vmetric[2] * fontSize * current.fontMatrix[0] /
-                    fontSizeScale * geom.vScale;
         }
         this.textLayer.appendText(geom);
       }

web/text_layer_builder.js

@@ -83,9 +83,6 @@ var TextLayerBuilder = function textLayerBuilder(options) {
         var textScale = textDiv.dataset.canvasWidth / width;
         var rotation = textDiv.dataset.angle;
         var transform = 'scale(' + textScale + ', 1)';
-        if (bidiTexts[i].dir === 'ttb') {
-          rotation += 90;
-        }
         transform = 'rotate(' + rotation + 'deg) ' + transform;
         CustomStyle.setProp('transform' , textDiv, transform);
         CustomStyle.setProp('transformOrigin' , textDiv, '0% 0%');
@@ -161,7 +158,7 @@ var TextLayerBuilder = function textLayerBuilder(options) {
 
       textDiv.textContent = bidiText.str;
       // bidiText.dir may be 'ttb' for vertical texts.
-      textDiv.dir = bidiText.dir === 'rtl' ? 'rtl' : 'ltr';
+      textDiv.dir = bidiText.dir;
     }
 
     this.setupRenderLayoutTimer();