From dbea4615e8cac6d59f8c4e0b2704a89d239928fa Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 26 Jul 2019 16:10:03 -0700
Subject: [PATCH] More corner work

---
 .../block_render_draw_highlight.js             |  3 ---
 .../block_rendering_constants.js               | 18 ++++--------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/core/renderers/block_rendering_rewrite/block_render_draw_highlight.js b/core/renderers/block_rendering_rewrite/block_render_draw_highlight.js
index 216263a73..7485af378 100644
--- a/core/renderers/block_rendering_rewrite/block_render_draw_highlight.js
+++ b/core/renderers/block_rendering_rewrite/block_render_draw_highlight.js
@@ -64,9 +64,6 @@ Blockly.blockRendering.Highlighter.prototype.drawTopCorner = function(row) {
       this.highlightSteps_.push(
           Blockly.blockRendering.constants.OUTSIDE_CORNER_HIGHLIGHTS.topLeftStart(
               this.info_.RTL));
-      // this.highlightSteps_.push(this.info_.RTL ?
-      //     Blockly.blockRendering.constants.TOP_LEFT_CORNER_START_HIGHLIGHT_RTL :
-      //     Blockly.blockRendering.constants.TOP_LEFT_CORNER_START_HIGHLIGHT_LTR);
       this.highlightSteps_.push(
           Blockly.blockRendering.constants.OUTSIDE_CORNER_HIGHLIGHTS.topLeft);
     } else if (elem.type === 'previous connection') {
diff --git a/core/renderers/block_rendering_rewrite/block_rendering_constants.js b/core/renderers/block_rendering_rewrite/block_rendering_constants.js
index af1c0c350..6d3008096 100644
--- a/core/renderers/block_rendering_rewrite/block_rendering_constants.js
+++ b/core/renderers/block_rendering_rewrite/block_rendering_constants.js
@@ -358,14 +358,6 @@ Blockly.blockRendering.constants.INSIDE_CORNER_HIGHLIGHTS = (function() {
    */
   var distance45outside = (1 - Math.SQRT1_2) * (radius + offset) - offset;
 
-  /**
-   * Distance from shape edge to intersect with a curved corner at 45 degrees.
-   * Applies to highlighting on around the inside of a curve.
-   * @const
-   */
-  var distance45inside = (1 - Math.SQRT1_2) * (radius - offset) + offset;
-
-
   var pathTopRtl = Blockly.utils.svgPaths.arc('a', '0 0,0', radius,
       Blockly.utils.svgPaths.point(
           -distance45outside - offset,
@@ -427,24 +419,22 @@ Blockly.blockRendering.constants.OUTSIDE_CORNER_HIGHLIGHTS = (function() {
    * @const
    */
   var topLeftCornerStartRtl =
-      'm ' + distance45inside + ',' +
-      distance45inside;
+      Blockly.utils.svgPaths.moveBy(distance45inside, distance45inside);
 
   /**
    * SVG start point for drawing the top-left corner's highlight in LTR.
    * @const
    */
   var topLeftCornerStartLtr =
-      'm 0.5,' + (radius - offset);
+      Blockly.utils.svgPaths.moveBy(offset, radius - offset);
 
   /**
    * SVG path for drawing the highlight on the rounded top-left corner.
    * @const
    */
   var topLeftCornerHighlight =
-      'A ' + (radius - offset) + ',' +
-      (radius - offset) + ' 0 0,1 ' +
-      radius + ',0.5';
+      Blockly.utils.svgPaths.arc('A', '0 0,1', radius - offset,
+          Blockly.utils.svgPaths.point(radius, offset));
 
 
   var bottomLeftCornerStart =