[WIP] Merge scrollbar.js

This commit is contained in:
Evan W. Patton
2016-09-28 22:02:18 -04:00
parent 37f04bc014
commit 5851a6deb9
2 changed files with 0 additions and 21 deletions

View File

@@ -74,7 +74,6 @@ Blockly.ScrollbarPair.prototype.dispose = function() {
* Also reposition the corner rectangle.
*/
Blockly.ScrollbarPair.prototype.resize = function() {
var start = new Date().getTime();
// Look up the host metrics once, and use for both scrollbars.
var hostMetrics = this.workspace_.getMetrics();
if (!hostMetrics) {
@@ -128,10 +127,6 @@ Blockly.ScrollbarPair.prototype.resize = function() {
}
// Cache the current metrics to potentially short-cut the next resize event.
this.oldHostMetrics_ = hostMetrics;
var stop = new Date().getTime();
var timeDiff = stop - start;
Blockly.Instrument.stats.scrollBarResizeCalls++; //***lyn
Blockly.Instrument.stats.scrollBarResizeTime += timeDiff; //***lyn
};
/**

View File

@@ -1,16 +0,0 @@
***************
*** 27,32 ****
goog.provide('Blockly.Scrollbar');
goog.provide('Blockly.ScrollbarPair');
goog.require('goog.userAgent');
--- 27,33 ----
goog.provide('Blockly.Scrollbar');
goog.provide('Blockly.ScrollbarPair');
+ goog.require('Blockly.Instrument'); // lyn's instrumentation code
goog.require('goog.userAgent');