From 60cce6cd0c6c6afe0b13f0b093eaaf01323b8b38 Mon Sep 17 00:00:00 2001
From: Neil Fraser <fraser@google.com>
Date: Thu, 28 Jun 2018 15:44:33 -0700
Subject: [PATCH] Remove goog.math angle functions.

---
 core/bubble.js      |  3 +--
 core/field_angle.js |  7 +++----
 core/utils.js       | 20 ++++++++++++++++++++
 core/workspace.js   |  8 ++++----
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/core/bubble.js b/core/bubble.js
index de58ea440..66d5b68e8 100644
--- a/core/bubble.js
+++ b/core/bubble.js
@@ -29,7 +29,6 @@ goog.provide('Blockly.Bubble');
 goog.require('Blockly.Touch');
 goog.require('Blockly.Workspace');
 goog.require('goog.dom');
-goog.require('goog.math');
 goog.require('goog.math.Coordinate');
 goog.require('goog.userAgent');
 
@@ -56,7 +55,7 @@ Blockly.Bubble = function(workspace, content, shape, anchorXY,
   if (this.workspace_.RTL) {
     angle = -angle;
   }
-  this.arrow_radians_ = goog.math.toRadians(angle);
+  this.arrow_radians_ = Blockly.utils.toRadians(angle);
 
   var canvas = workspace.getBubbleCanvas();
   canvas.appendChild(this.createDom_(content, !!(bubbleWidth && bubbleHeight)));
diff --git a/core/field_angle.js b/core/field_angle.js
index a0549c0c3..581860484 100644
--- a/core/field_angle.js
+++ b/core/field_angle.js
@@ -27,7 +27,6 @@
 goog.provide('Blockly.FieldAngle');
 
 goog.require('Blockly.FieldTextInput');
-goog.require('goog.math');
 goog.require('goog.userAgent');
 
 
@@ -231,7 +230,7 @@ Blockly.FieldAngle.prototype.onMouseMove = function(e) {
     // This shouldn't happen, but let's not let this error propagate further.
     return;
   }
-  angle = goog.math.toDegrees(angle);
+  angle = Blockly.utils.toDegrees(angle);
   // 0: East, 90: North, 180: West, 270: South.
   if (dx < 0) {
     angle += 180;
@@ -278,12 +277,12 @@ Blockly.FieldAngle.prototype.updateGraph_ = function() {
     return;
   }
   var angleDegrees = Number(this.getText()) + Blockly.FieldAngle.OFFSET;
-  var angleRadians = goog.math.toRadians(angleDegrees);
+  var angleRadians = Blockly.utils.toRadians(angleDegrees);
   var path = ['M ', Blockly.FieldAngle.HALF, ',', Blockly.FieldAngle.HALF];
   var x2 = Blockly.FieldAngle.HALF;
   var y2 = Blockly.FieldAngle.HALF;
   if (!isNaN(angleRadians)) {
-    var angle1 = goog.math.toRadians(Blockly.FieldAngle.OFFSET);
+    var angle1 = Blockly.utils.toRadians(Blockly.FieldAngle.OFFSET);
     var x1 = Math.cos(angle1) * Blockly.FieldAngle.RADIUS;
     var y1 = Math.sin(angle1) * -Blockly.FieldAngle.RADIUS;
     if (Blockly.FieldAngle.CLOCKWISE) {
diff --git a/core/utils.js b/core/utils.js
index 9fc42a912..716fe87d0 100644
--- a/core/utils.js
+++ b/core/utils.js
@@ -928,3 +928,23 @@ Blockly.utils.arrayRemove = function(arr, obj) {
   arr.splice(i, 1);
   return true;
 };
+
+/**
+ * Converts degrees to radians.
+ * Copied from Closure's goog.math.toRadians.
+ * @param {number} angleDegrees Angle in degrees.
+ * @return {number} Angle in radians.
+ */
+Blockly.utils.toRadians = function(angleDegrees) {
+  return angleDegrees * Math.PI / 180;
+};
+
+/**
+ * Converts radians to degrees.
+ * Copied from Closure's goog.math.toDegrees.
+ * @param {number} angleRadians Angle in radians.
+ * @return {number} Angle in degrees.
+ */
+Blockly.utils.toDegrees = function(angleRadians) {
+  return angleRadians * 180 / Math.PI;
+};
diff --git a/core/workspace.js b/core/workspace.js
index 90a3cd3d5..19823189f 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -30,8 +30,6 @@ goog.require('Blockly.utils');
 goog.require('Blockly.VariableMap');
 goog.require('Blockly.WorkspaceComment');
 
-goog.require('goog.math');
-
 
 /**
  * Class for a workspace.  This is a data structure that contains blocks.
@@ -176,7 +174,8 @@ Blockly.Workspace.prototype.getTopBlocks = function(ordered) {
   // Copy the topBlocks_ list.
   var blocks = [].concat(this.topBlocks_);
   if (ordered && blocks.length > 1) {
-    var offset = Math.sin(goog.math.toRadians(Blockly.Workspace.SCAN_ANGLE));
+    var offset =
+        Math.sin(Blockly.utils.toRadians(Blockly.Workspace.SCAN_ANGLE));
     if (this.RTL) {
       offset *= -1;
     }
@@ -232,7 +231,8 @@ Blockly.Workspace.prototype.getTopComments = function(ordered) {
   // Copy the topComments_ list.
   var comments = [].concat(this.topComments_);
   if (ordered && comments.length > 1) {
-    var offset = Math.sin(goog.math.toRadians(Blockly.Workspace.SCAN_ANGLE));
+    var offset =
+        Math.sin(Blockly.utils.toRadians(Blockly.Workspace.SCAN_ANGLE));
     if (this.RTL) {
       offset *= -1;
     }