From d6d34bf9ce9d552cc97fc9f6063a82ba886487fd Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Wed, 25 May 2016 13:22:08 -0700
Subject: [PATCH] Cache host metrics and make sure something has changed before
 resizing scrollbars.

---
 core/scrollbar.js | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/core/scrollbar.js b/core/scrollbar.js
index b97fe35d9..8b4bfe498 100644
--- a/core/scrollbar.js
+++ b/core/scrollbar.js
@@ -190,6 +190,7 @@ Blockly.Scrollbar = function(workspace, horizontal, opt_pair) {
   this.workspace_ = workspace;
   this.pair_ = opt_pair || false;
   this.horizontal_ = horizontal;
+  this.oldHostMetrics_ = {};
 
   this.createDom_();
 
@@ -223,6 +224,35 @@ if (goog.events.BrowserFeature.TOUCH_ENABLED) {
   Blockly.Scrollbar.scrollbarThickness = 25;
 }
 
+/**
+ * @param {!Object} first An object containing computed measurements of a
+ *    workspace.
+ * @param {!Object} second Another object containing computed measurements of a
+ *    workspace.
+ * @return {boolean} Whether the two sets of metrics are equivalent.
+ * @private
+ */
+Blockly.Scrollbar.metricsAreEquivalent_ = function(first, second) {
+  if (!(first && second)) {
+    return false;
+  }
+
+  if (first.viewWidth != second.viewWidth ||
+      first.viewHeight != second.viewHeight ||
+      first.viewLeft != second.viewLeft ||
+      first.viewTop != second.viewTop ||
+      first.absoluteTop != second.absoluteTop ||
+      first.absoluteLeft != second.absoluteLeft ||
+      first.contentWidth != second.contentWidth ||
+      first.contentHeight != second.contentHeight ||
+      first.contentLeft != second.contentLeft ||
+      first.contentTop != second.contentTop) {
+    return false;
+  }
+
+  return true;
+};
+
 /**
  * Dispose of this scrollbar.
  * Unlink from all DOM elements to prevent memory leaks.
@@ -257,6 +287,13 @@ Blockly.Scrollbar.prototype.resize = function(opt_metrics) {
       return;
     }
   }
+
+  if (Blockly.Scrollbar.metricsAreEquivalent_(hostMetrics,
+      this.oldHostMetrics_)) {
+    return;
+  }
+  this.oldHostMetrics_ = hostMetrics;
+
   /* hostMetrics is an object with the following properties.
    * .viewHeight: Height of the visible rectangle,
    * .viewWidth: Width of the visible rectangle,