From b2052aeff44449233a6fb6d24ab4b04dd1906b23 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Thu, 28 Jan 2021 16:50:00 -0800
Subject: [PATCH] Add requireTypes for renderers/common

---
 core/renderers/common/block_rendering.js |  3 +++
 core/renderers/common/constants.js       |  3 ++-
 core/renderers/common/debugger.js        |  4 ++++
 core/renderers/common/drawer.js          |  3 +++
 core/renderers/common/info.js            |  5 +++++
 core/renderers/common/marker_svg.js      |  8 ++++++++
 core/renderers/common/path_object.js     |  3 +++
 core/renderers/common/renderer.js        | 13 ++++++++++---
 8 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/core/renderers/common/block_rendering.js b/core/renderers/common/block_rendering.js
index 8b4a2b572..333766470 100644
--- a/core/renderers/common/block_rendering.js
+++ b/core/renderers/common/block_rendering.js
@@ -19,6 +19,9 @@ goog.provide('Blockly.blockRendering');
 goog.require('Blockly.registry');
 goog.require('Blockly.utils.object');
 
+goog.requireType('Blockly.blockRendering.Renderer');
+goog.requireType('Blockly.Theme');
+
 
 /**
  * Whether or not the debugger is turned on.
diff --git a/core/renderers/common/constants.js b/core/renderers/common/constants.js
index 60443180f..c0db53522 100644
--- a/core/renderers/common/constants.js
+++ b/core/renderers/common/constants.js
@@ -21,7 +21,8 @@ goog.require('Blockly.utils.svgPaths');
 goog.require('Blockly.utils.userAgent');
 
 goog.requireType('Blockly.blockRendering.Debug');
-
+goog.requireType('Blockly.RenderedConnection');
+goog.requireType('Blockly.Theme');
 
 /**
  * An object that provides constants for rendering blocks.
diff --git a/core/renderers/common/debugger.js b/core/renderers/common/debugger.js
index 822959529..9f65d5bc6 100644
--- a/core/renderers/common/debugger.js
+++ b/core/renderers/common/debugger.js
@@ -24,6 +24,10 @@ goog.require('Blockly.constants');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.Svg');
 
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.requireType('Blockly.BlockSvg');
+goog.requireType('Blockly.RenderedConnection');
+
 
 /**
  * An object that renders rectangles and dots for debugging rendering code.
diff --git a/core/renderers/common/drawer.js b/core/renderers/common/drawer.js
index 6f5cc249d..73580c067 100644
--- a/core/renderers/common/drawer.js
+++ b/core/renderers/common/drawer.js
@@ -22,6 +22,9 @@ goog.require('Blockly.blockRendering.TopRow');
 goog.require('Blockly.blockRendering.Types');
 goog.require('Blockly.utils.svgPaths');
 
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.requireType('Blockly.BlockSvg');
+
 
 /**
  * An object that draws a block based on the given rendering information.
diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js
index 0824469ae..ae6ce2685 100644
--- a/core/renderers/common/info.js
+++ b/core/renderers/common/info.js
@@ -31,6 +31,11 @@ goog.require('Blockly.blockRendering.TopRow');
 goog.require('Blockly.blockRendering.Types');
 goog.require('Blockly.constants');
 
+goog.requireType('Blockly.blockRendering.Renderer');
+goog.requireType('Blockly.BlockSvg');
+goog.requireType('Blockly.Input');
+goog.requireType('Blockly.RenderedConnection');
+
 
 /**
  * An object containing all sizing information needed to draw this block.
diff --git a/core/renderers/common/marker_svg.js b/core/renderers/common/marker_svg.js
index fbb34e16d..104a7837c 100644
--- a/core/renderers/common/marker_svg.js
+++ b/core/renderers/common/marker_svg.js
@@ -19,6 +19,14 @@ goog.require('Blockly.Events.MarkerMove');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.Svg');
 
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.requireType('Blockly.BlockSvg');
+goog.requireType('Blockly.Connection');
+goog.requireType('Blockly.Field');
+goog.requireType('Blockly.Marker');
+goog.requireType('Blockly.RenderedConnection');
+goog.requireType('Blockly.WorkspaceSvg');
+
 
 /**
  * Class for a marker.
diff --git a/core/renderers/common/path_object.js b/core/renderers/common/path_object.js
index c3a283329..f2c3f319e 100644
--- a/core/renderers/common/path_object.js
+++ b/core/renderers/common/path_object.js
@@ -19,6 +19,9 @@ goog.require('Blockly.Theme');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.Svg');
 
+goog.requireType('Blockly.Block');
+goog.requireType('Blockly.Connection');
+
 
 /**
  * An object that handles creating and setting each of the SVG elements
diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js
index 58d18dec2..ded0ab9d7 100644
--- a/core/renderers/common/renderer.js
+++ b/core/renderers/common/renderer.js
@@ -13,16 +13,23 @@
 goog.provide('Blockly.blockRendering.Renderer');
 
 goog.require('Blockly.blockRendering.ConstantProvider');
-goog.require('Blockly.blockRendering.MarkerSvg');
+goog.require('Blockly.blockRendering.Debug');
 goog.require('Blockly.blockRendering.Drawer');
+goog.require('Blockly.blockRendering.MarkerSvg');
 goog.require('Blockly.blockRendering.IPathObject');
 goog.require('Blockly.blockRendering.PathObject');
 goog.require('Blockly.blockRendering.RenderInfo');
 goog.require('Blockly.constants');
 goog.require('Blockly.InsertionMarkerManager');
+goog.require('Blockly.IRegistrable');
 
-goog.requireType('Blockly.blockRendering.Debug');
-goog.requireType('Blockly.IRegistrable');
+goog.requireType('Blockly.BlockSvg');
+goog.requireType('Blockly.Connection');
+goog.requireType('Blockly.Marker');
+goog.requireType('Blockly.RenderedConnection');
+goog.requireType('Blockly.Theme');
+goog.requireType('Blockly.utils.object');
+goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**