From 51e86263c7af26d3b15749700a905c3973df4f69 Mon Sep 17 00:00:00 2001
From: Neil Fraser <fraser@google.com>
Date: Fri, 29 Jun 2018 14:26:11 -0700
Subject: [PATCH] Correct requires for goog.math.*

---
 core/contextmenu.js                  | 1 +
 core/events.js                       | 2 --
 core/field_textinput.js              | 1 +
 core/field_variable.js               | 2 ++
 core/flyout_dragger.js               | 2 --
 core/rendered_connection.js          | 1 +
 core/scrollbar.js                    | 1 +
 core/workspace_comment_render_svg.js | 2 ++
 core/workspace_comment_svg.js        | 1 +
 core/workspace_drag_surface_svg.js   | 2 --
 10 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/core/contextmenu.js b/core/contextmenu.js
index 3e64f5ba5..b93cc1d73 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -35,6 +35,7 @@ goog.require('Blockly.utils');
 goog.require('Blockly.utils.uiMenu');
 
 goog.require('goog.events');
+goog.require('goog.math.Coordinate');
 goog.require('goog.style');
 goog.require('goog.ui.Menu');
 goog.require('goog.ui.MenuItem');
diff --git a/core/events.js b/core/events.js
index 6a807f5e6..fe4d1af57 100644
--- a/core/events.js
+++ b/core/events.js
@@ -32,8 +32,6 @@ goog.provide('Blockly.Events');
 
 goog.require('Blockly.utils');
 
-goog.require('goog.math.Coordinate');
-
 
 /**
  * Group ID for new events.  Grouped events are indivisible.
diff --git a/core/field_textinput.js b/core/field_textinput.js
index 87d1c6ac9..5398b9b3a 100644
--- a/core/field_textinput.js
+++ b/core/field_textinput.js
@@ -31,6 +31,7 @@ goog.require('Blockly.Msg');
 goog.require('Blockly.utils');
 
 goog.require('goog.dom');
+goog.require('goog.math.Coordinate');
 goog.require('goog.userAgent');
 
 
diff --git a/core/field_variable.js b/core/field_variable.js
index 712706d0a..56ef4a798 100644
--- a/core/field_variable.js
+++ b/core/field_variable.js
@@ -32,6 +32,8 @@ goog.require('Blockly.utils');
 goog.require('Blockly.VariableModel');
 goog.require('Blockly.Variables');
 
+goog.require('goog.math.Size');
+
 
 /**
  * Class for a variable's dropdown field.
diff --git a/core/flyout_dragger.js b/core/flyout_dragger.js
index 2cc5f16a0..a261de57f 100644
--- a/core/flyout_dragger.js
+++ b/core/flyout_dragger.js
@@ -28,8 +28,6 @@ goog.provide('Blockly.FlyoutDragger');
 
 goog.require('Blockly.WorkspaceDragger');
 
-goog.require('goog.math.Coordinate');
-
 
 /**
  * Class for a flyout dragger.  It moves a flyout workspace around when it is
diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index 7eb8ed72c..c39f5b989 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -30,6 +30,7 @@ goog.require('Blockly.Connection');
 goog.require('Blockly.utils');
 
 goog.require('goog.dom');
+goog.require('goog.math.Coordinate');
 
 
 /**
diff --git a/core/scrollbar.js b/core/scrollbar.js
index 37b53f9e4..22db386c9 100644
--- a/core/scrollbar.js
+++ b/core/scrollbar.js
@@ -31,6 +31,7 @@ goog.require('Blockly.utils');
 
 goog.require('goog.dom');
 goog.require('goog.events.BrowserFeature');
+goog.require('goog.math.Coordinate');
 
 
 /**
diff --git a/core/workspace_comment_render_svg.js b/core/workspace_comment_render_svg.js
index c0ee314a5..5390a0618 100644
--- a/core/workspace_comment_render_svg.js
+++ b/core/workspace_comment_render_svg.js
@@ -29,6 +29,8 @@ goog.provide('Blockly.WorkspaceCommentSvg.render');
 goog.require('Blockly.utils');
 goog.require('Blockly.WorkspaceCommentSvg');
 
+goog.require('goog.math.Coordinate');
+
 
 /**
  * Size of the resize icon.
diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index e9bf1ee05..8786f4488 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -33,6 +33,7 @@ goog.require('Blockly.utils');
 goog.require('Blockly.WorkspaceComment');
 
 goog.require('goog.dom');
+goog.require('goog.math.Coordinate');
 
 
 /**
diff --git a/core/workspace_drag_surface_svg.js b/core/workspace_drag_surface_svg.js
index 07429a2e9..6c45a0cba 100644
--- a/core/workspace_drag_surface_svg.js
+++ b/core/workspace_drag_surface_svg.js
@@ -32,8 +32,6 @@ goog.provide('Blockly.WorkspaceDragSurfaceSvg');
 
 goog.require('Blockly.utils');
 
-goog.require('goog.math.Coordinate');
-
 
 /**
  * Blocks are moved into this SVG during a drag, improving performance.