[MD settings] only add overscroll if needed.

chrome/browser/resources/settings/settings_main/settings_main.js

 // Copyright 2015 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.
 
 /**
  * @fileoverview
  * 'settings-main' displays the selected settings page.
  */
 Polymer({
   is: 'settings-main',
@@ skipping 123 matching lines @@
 
       if (this.showPages_.advanced) {
         assert(!this.pageVisibility ||
             this.pageVisibility.advancedSettings !== false);
         this.advancedToggleExpanded_ = true;
       }
     }
 
     // Wait for any other changes prior to calculating the overflow padding.
     setTimeout(function() {
+      // Ensure any dom-if reflects the current properties.
+      Polymer.dom.flush();

[dschuyler, 2016/07/30 00:46:29]

I moved this to keep all the timeout/flush
('is the dom ready to use?') code together.

+
       this.$.overscroll.style.paddingBottom = this.overscrollHeight_() + 'px';
     }.bind(this));
   },
 
   /**
-   * Return the height that the over scroll padding should be set to.
+   * Return the height that the overscroll padding should be set to.
    * This is used to determine how much padding to apply to the end of the
    * content so that the last element may align with the top of the content
    * area.
    * @return {number}
    * @private
    */
   overscrollHeight_: function() {
     if (!this.currentRoute || this.currentRoute.subpage.length != 0 ||
         this.showPages_.about) {
       return 0;
     }
 
-    // Ensure any dom-if reflects the current properties.
-    Polymer.dom.flush();
+    var query = 'settings-section[section="' + this.currentRoute.section + '"]';
+    var topSection = this.$$('settings-basic-page').$$(query);
+    if (!topSection && this.showPages_.advanced)
+      topSection = this.$$('settings-advanced-page').$$(query);
 
-    /**
-     * @param {!Element} element
-     * @return {number}
-     */
-    var calcHeight = function(element) {
-      var style = getComputedStyle(element);
-      var height = this.parentNode.scrollHeight - element.offsetHeight +
-          parseFloat(style.marginTop) + parseFloat(style.marginBottom);
-      assert(height >= 0);
-      return height;
-    }.bind(this);
-
-    if (this.showPages_.advanced) {
-      var lastSection = this.$$('settings-advanced-page').$$(
-          'settings-section:last-of-type');
-      // |lastSection| may be null in unit tests.
-      if (!lastSection)
-        return 0;
-      return calcHeight(lastSection);
+    if (topSection) {
+      return Math.max(0,
+          this.parentNode.scrollHeight -
+          (this.$.overscroll.offsetTop -
+           (topSection.offsetParent.offsetTop + topSection.offsetTop)));
     }
-
-    assert(this.showPages_.basic);
-    var lastSection = this.$$('settings-basic-page').$$(
-        'settings-section:last-of-type');
-    // |lastSection| may be null in unit tests.
-    if (!lastSection)
-      return 0;
-    var toggleContainer = this.$$('#toggleContainer');
-    return calcHeight(lastSection) -
-        (toggleContainer ? toggleContainer.offsetHeight : 0);
   },
 
   /** @private */
   toggleAdvancedPage_: function() {
     this.fire('toggle-advanced-page', !this.advancedToggleExpanded_);
   },
 
   /**
    * Navigates to the default search page (if necessary).
    * @private
@@ skipping 36 matching lines @@
 
   /**
    * @param {(boolean|undefined)} visibility
    * @return {boolean} True unless visibility is false.
    * @private
    */
   showAdvancedSettings_: function(visibility) {
     return visibility !== false;
   },
 });