From 5851a6deb9f92da2c9698b531b8cdaf7e0c201e6 Mon Sep 17 00:00:00 2001
From: "Evan W. Patton" <ewpatton@gmail.com>
Date: Wed, 28 Sep 2016 22:02:18 -0400
Subject: [PATCH] [WIP] Merge scrollbar.js

---
 core/scrollbar.js     |  5 -----
 core/scrollbar.js.rej | 16 ----------------
 2 files changed, 21 deletions(-)
 delete mode 100644 core/scrollbar.js.rej

diff --git a/core/scrollbar.js b/core/scrollbar.js
index 9df81a34b..5fae5e13a 100644
--- a/core/scrollbar.js
+++ b/core/scrollbar.js
@@ -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
 };
 
 /**
diff --git a/core/scrollbar.js.rej b/core/scrollbar.js.rej
deleted file mode 100644
index cd2d0eda8..000000000
--- a/core/scrollbar.js.rej
+++ /dev/null
@@ -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');
-  
-