diff --git a/core/trashcan.js b/core/trashcan.js index 30444c8f4..28baa0f20 100644 --- a/core/trashcan.js +++ b/core/trashcan.js @@ -26,7 +26,6 @@ goog.provide('Blockly.Trashcan'); -goog.require('Blockly.Instrument'); // lyn's instrumentation code goog.require('goog.Timer'); goog.require('goog.dom'); goog.require('goog.math'); @@ -259,10 +258,6 @@ Blockly.Trashcan.prototype.position = function() { } this.svgGroup_.setAttribute('transform', 'translate(' + this.left_ + ',' + this.top_ + ')'); - var stop = new Date().getTime(); - var timeDiff = stop - start; - Blockly.Instrument.stats.trashCanPositionCalls++; //***lyn - Blockly.Instrument.stats.trashCanPositionTime += timeDiff; //***lyn }; /** diff --git a/core/trashcan.js.rej b/core/trashcan.js.rej deleted file mode 100644 index 312458764..000000000 --- a/core/trashcan.js.rej +++ /dev/null @@ -1,16 +0,0 @@ -*************** -*** 218,223 **** - * @private - */ - Blockly.Trashcan.prototype.position_ = function() { - var metrics = this.workspace_.getMetrics(); - if (!metrics) { - // There are no metrics available (workspace is probably not visible). ---- 219,225 ---- - * @private - */ - Blockly.Trashcan.prototype.position_ = function() { -+ var start = new Date().getTime(); - var metrics = this.workspace_.getMetrics(); - if (!metrics) { - // There are no metrics available (workspace is probably not visible).