From 297f2a0b60d20fe686b23fd2572e90979307233f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 17 Aug 2021 09:32:25 -0700
Subject: [PATCH] Migrate core/renderers/zelos/measurables/rows.js named
 requires

---
 core/renderers/zelos/measurables/bottom_row.js | 16 ++++++++--------
 core/renderers/zelos/measurables/top_row.js    | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/core/renderers/zelos/measurables/bottom_row.js b/core/renderers/zelos/measurables/bottom_row.js
index eb854466a..d3ba8a3b2 100644
--- a/core/renderers/zelos/measurables/bottom_row.js
+++ b/core/renderers/zelos/measurables/bottom_row.js
@@ -13,10 +13,10 @@
 goog.module('Blockly.zelos.BottomRow');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.BottomRow');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
+const BaseBottomRow = goog.require('Blockly.blockRendering.BottomRow');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -24,17 +24,17 @@ goog.requireType('Blockly.blockRendering.ConstantProvider');
  * a block as well as spacing information for the top row.
  * Elements in a bottom row can consist of corners, spacers and next
  * connections.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.BottomRow}
+ * @extends {BaseBottomRow}
  */
 const BottomRow = function(constants) {
   BottomRow.superClass_.constructor.call(this, constants);
 };
-Blockly.utils.object.inherits(BottomRow,
-    Blockly.blockRendering.BottomRow);
+object.inherits(BottomRow,
+    BaseBottomRow);
 
 /**
  * @override
diff --git a/core/renderers/zelos/measurables/top_row.js b/core/renderers/zelos/measurables/top_row.js
index 176b637e1..76777263c 100644
--- a/core/renderers/zelos/measurables/top_row.js
+++ b/core/renderers/zelos/measurables/top_row.js
@@ -13,10 +13,10 @@
 goog.module('Blockly.zelos.TopRow');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.TopRow');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
+const BaseTopRow = goog.require('Blockly.blockRendering.TopRow');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -26,17 +26,17 @@ goog.requireType('Blockly.blockRendering.ConstantProvider');
  * connections.
  * After this constructor is called, the row will contain all non-spacer
  * elements it needs.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.TopRow}
+ * @extends {BaseTopRow}
  */
 const TopRow = function(constants) {
   TopRow.superClass_.constructor.call(this, constants);
 };
-Blockly.utils.object.inherits(TopRow,
-    Blockly.blockRendering.TopRow);
+object.inherits(TopRow,
+    BaseTopRow);
 
 /**
  * @override