From 04a77f0ef214144162083e321722908a94d57fed Mon Sep 17 00:00:00 2001 From: Rachel Fenichel Date: Fri, 16 Aug 2019 17:05:24 -0700 Subject: [PATCH 1/2] Fix some compiler warnings --- .../block_rendering_rewrite/block_render_draw.js | 1 + .../block_render_draw_debug.js | 1 + .../block_render_draw_highlight.js | 1 + .../block_rendering_rewrite/measurables.js | 13 +++++++++++++ 4 files changed, 16 insertions(+) diff --git a/core/renderers/block_rendering_rewrite/block_render_draw.js b/core/renderers/block_rendering_rewrite/block_render_draw.js index b9d27b8cf..9ac74df82 100644 --- a/core/renderers/block_rendering_rewrite/block_render_draw.js +++ b/core/renderers/block_rendering_rewrite/block_render_draw.js @@ -38,6 +38,7 @@ goog.require('Blockly.blockRendering.Measurable'); * @param {!Blockly.blockRendering.RenderInfo} info An object containing all * information needed to render this block. * @package + * @constructor */ Blockly.blockRendering.Drawer = function(block, info) { this.block_ = block; diff --git a/core/renderers/block_rendering_rewrite/block_render_draw_debug.js b/core/renderers/block_rendering_rewrite/block_render_draw_debug.js index 454d06706..17d15cac0 100644 --- a/core/renderers/block_rendering_rewrite/block_render_draw_debug.js +++ b/core/renderers/block_rendering_rewrite/block_render_draw_debug.js @@ -33,6 +33,7 @@ goog.require('Blockly.blockRendering.Measurable'); /** * An object that renders rectangles and dots for debugging rendering code. * @package + * @constructor */ Blockly.blockRendering.Debug = function() { /** 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 98ccfb5c1..289aa1fa7 100644 --- a/core/renderers/block_rendering_rewrite/block_render_draw_highlight.js +++ b/core/renderers/block_rendering_rewrite/block_render_draw_highlight.js @@ -46,6 +46,7 @@ goog.require('Blockly.blockRendering.Measurable'); * @param {!Blockly.BlockSvg.PathObject} pathObject An object that stores all of * the block's paths before they are propagated to the page. * @package + * @constructor */ Blockly.blockRendering.Highlighter = function(info, pathObject) { this.info_ = info; diff --git a/core/renderers/block_rendering_rewrite/measurables.js b/core/renderers/block_rendering_rewrite/measurables.js index 09d4233bc..dd4014438 100644 --- a/core/renderers/block_rendering_rewrite/measurables.js +++ b/core/renderers/block_rendering_rewrite/measurables.js @@ -159,6 +159,7 @@ Blockly.blockRendering.Measurable.prototype.isJaggedEdge = function() { * @param {!Blockly.Input} input The input to measure and store information for. * @package * @constructor + * @extends {Blockly.blockRendering.Measurable} */ Blockly.blockRendering.Input = function(input) { Blockly.blockRendering.Input.superClass_.constructor.call(this); @@ -191,6 +192,7 @@ goog.inherits(Blockly.blockRendering.Input, Blockly.blockRendering.Measurable); * @param {!Blockly.Icon} icon The icon to measure and store information for. * @package * @constructor + * @extends {Blockly.blockRendering.Measurable} */ Blockly.blockRendering.Icon = function(icon) { Blockly.blockRendering.Icon.superClass_.constructor.call(this); @@ -209,6 +211,7 @@ goog.inherits(Blockly.blockRendering.Icon, Blockly.blockRendering.Measurable); * takes up during rendering * @package * @constructor + * @extends {Blockly.blockRendering.Measurable} */ Blockly.blockRendering.JaggedEdge = function() { Blockly.blockRendering.JaggedEdge.superClass_.constructor.call(this); @@ -226,6 +229,7 @@ goog.inherits(Blockly.blockRendering.JaggedEdge, Blockly.blockRendering.Measurab * @param {!Blockly.Input} parentInput The parent input for the field. * @package * @constructor + * @extends {Blockly.blockRendering.Measurable} */ Blockly.blockRendering.Field = function(field, parentInput) { Blockly.blockRendering.Field.superClass_.constructor.call(this); @@ -248,6 +252,7 @@ goog.inherits(Blockly.blockRendering.Field, Blockly.blockRendering.Measurable); * information for. * @package * @constructor + * @extends {Blockly.blockRendering.Input} */ Blockly.blockRendering.InlineInput = function(input) { Blockly.blockRendering.InlineInput.superClass_.constructor.call(this, input); @@ -278,6 +283,7 @@ goog.inherits(Blockly.blockRendering.InlineInput, Blockly.blockRendering.Input); * information for. * @package * @constructor + * @extends {Blockly.blockRendering.Input} */ Blockly.blockRendering.StatementInput = function(input) { Blockly.blockRendering.StatementInput.superClass_.constructor.call(this, input); @@ -305,6 +311,7 @@ goog.inherits(Blockly.blockRendering.StatementInput, * information for. * @package * @constructor + * @extends {Blockly.blockRendering.Input} */ Blockly.blockRendering.ExternalValueInput = function(input) { Blockly.blockRendering.ExternalValueInput.superClass_.constructor.call(this, input); @@ -331,6 +338,7 @@ goog.inherits(Blockly.blockRendering.ExternalValueInput, * up during rendering. * @package * @constructor + * @extends {Blockly.blockRendering.Measurable} */ Blockly.blockRendering.OutputConnection = function() { Blockly.blockRendering.OutputConnection.superClass_.constructor.call(this); @@ -347,6 +355,7 @@ goog.inherits(Blockly.blockRendering.OutputConnection, Blockly.blockRendering.Me * up during rendering. * @package * @constructor + * @extends {Blockly.blockRendering.Measurable} */ Blockly.blockRendering.PreviousConnection = function() { Blockly.blockRendering.PreviousConnection.superClass_.constructor.call(this); @@ -362,6 +371,7 @@ goog.inherits(Blockly.blockRendering.PreviousConnection, Blockly.blockRendering. * up during rendering. * @package * @constructor + * @extends {Blockly.blockRendering.Measurable} */ Blockly.blockRendering.NextConnection = function() { Blockly.blockRendering.NextConnection.superClass_.constructor.call(this); @@ -376,6 +386,7 @@ goog.inherits(Blockly.blockRendering.NextConnection, Blockly.blockRendering.Meas * rendering. * @package * @constructor + * @extends {Blockly.blockRendering.Measurable} */ Blockly.blockRendering.Hat = function() { Blockly.blockRendering.Hat.superClass_.constructor.call(this); @@ -392,6 +403,7 @@ goog.inherits(Blockly.blockRendering.Hat, Blockly.blockRendering.Measurable); * during rendering. * @package * @constructor + * @extends {Blockly.blockRendering.Measurable} */ Blockly.blockRendering.SquareCorner = function() { Blockly.blockRendering.SquareCorner.superClass_.constructor.call(this); @@ -407,6 +419,7 @@ goog.inherits(Blockly.blockRendering.SquareCorner, Blockly.blockRendering.Measur * during rendering. * @package * @constructor + * @extends {Blockly.blockRendering.Measurable} */ Blockly.blockRendering.RoundCorner = function() { Blockly.blockRendering.RoundCorner.superClass_.constructor.call(this); From ca6e591047bcace522b50def9720587c383b5883 Mon Sep 17 00:00:00 2001 From: Rachel Fenichel Date: Fri, 16 Aug 2019 17:10:06 -0700 Subject: [PATCH 2/2] Turn off debug rendering --- core/renderers/block_rendering_rewrite/block_render_draw.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/renderers/block_rendering_rewrite/block_render_draw.js b/core/renderers/block_rendering_rewrite/block_render_draw.js index 9ac74df82..e38e4e6fb 100644 --- a/core/renderers/block_rendering_rewrite/block_render_draw.js +++ b/core/renderers/block_rendering_rewrite/block_render_draw.js @@ -69,7 +69,8 @@ Blockly.blockRendering.Drawer.prototype.draw_ = function() { this.pathObject_.inlineSteps = [this.inlinePath_]; this.block_.setPaths_(this.pathObject_); - this.block_.renderingDebugger.drawDebug(this.block_, this.info_); + // Uncomment to enable debug rendering. + // this.block_.renderingDebugger.drawDebug(this.block_, this.info_); this.recordSizeOnBlock_(); };