Use getBoundingClientRect.height

ampproject · Jan 8, 2019 · b4de619 · b4de619
1 parent 900c211
commit b4de619
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/service/viewport/viewport-binding-ios-embed-sd.js b/src/service/viewport/viewport-binding-ios-embed-sd.js
@@ -397,8 +397,9 @@ export class ViewportBindingIosEmbedShadowRoot_ {
   /** @override */
   getContentHeight() {
     const scrollingElement = this.wrapper_;
+    const rect = scrollingElement./*OK*/getBoundingClientRect();
     const style = getComputedStyle(scrollingElement);
-    return scrollingElement./*OK*/scrollHeight
+    return rect.height
         + this.paddingTop_
         + this.getBorderTop()
         + parseInt(style.marginTop, 10)

diff --git a/src/service/viewport/viewport-binding-ios-embed-wrapper.js b/src/service/viewport/viewport-binding-ios-embed-wrapper.js
@@ -235,8 +235,9 @@ export class ViewportBindingIosEmbedWrapper_ {
   /** @override */
   getContentHeight() {
     const scrollingElement = this.wrapper_;
+    const rect = scrollingElement./*OK*/getBoundingClientRect();
     const style = getComputedStyle(scrollingElement);
-    return scrollingElement./*OK*/scrollHeight
+    return rect.height
         + this.getBorderTop()
         + parseInt(style.marginTop, 10)
         + parseInt(style.marginBottom, 10);

diff --git a/src/service/viewport/viewport-binding-natural.js b/src/service/viewport/viewport-binding-natural.js
@@ -196,8 +196,9 @@ export class ViewportBindingNatural_ {
   /** @override */
   getContentHeight() {
     const scrollingElement = this.getScrollingElement();
+    const rect = scrollingElement./*OK*/getBoundingClientRect();
     const style = getComputedStyle(scrollingElement);
-    return scrollingElement./*OK*/scrollHeight
+    return rect.height
         + parseInt(style.marginTop, 10)
         + parseInt(style.marginBottom, 10);
   }