[polymer] Merge of master into polymer10-migration

telemetry/telemetry/internal/actions/scroll_bounce.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 'use strict';
 
 (function() {
   function supportedByBrowser() {
     return !!(window.chrome &&
               chrome.gpuBenchmarking &&
-              chrome.gpuBenchmarking.scrollBounce);
+              chrome.gpuBenchmarking.scrollBounce &&
+              chrome.gpuBenchmarking.visualViewportHeight &&
+              chrome.gpuBenchmarking.visualViewportWidth);
   }
 
   function ScrollBounceAction(opt_callback) {
     var self = this;
 
-    this.beginMeasuringHook = function() {}
-    this.endMeasuringHook = function() {}
+    this.beginMeasuringHook = function() {};
+    this.endMeasuringHook = function() {};
 
     this.callback_ = opt_callback;
   }
 
   ScrollBounceAction.prototype.start = function(options) {
     this.options_ = options;
     // Assign this.element_ here instead of constructor, because the constructor
     // ensures this method will be called after the document is loaded.
     this.element_ = this.options_.element;
     requestAnimationFrame(this.startGesture_.bind(this));
@@ skipping 20 matching lines @@
     this.endMeasuringHook();
 
     // We're done.
     if (this.callback_)
       this.callback_();
   };
 
   window.__ScrollBounceAction = ScrollBounceAction;
   window.__ScrollBounceAction_SupportedByBrowser = supportedByBrowser;
 })();