commit 6a0b5ca11487d02c420eb09f680aafd90cb447f5
author Shimeng (Simon) Wang <swang@google.com> Tue Feb 08 09:49:35 2011 -0800
committer Shimeng (Simon) Wang <swang@google.com> Tue Feb 08 10:19:53 2011 -0800
tree 105e083870ff4eb16b1803543f0fe5b22bf9272f
parent 5a50351cf33dcfc9a21f393521885cd3f248952d

Fix bug: use content height instead of view height.

issue: 3396895
Change-Id: I3012fa2c48d3e215d5b877ac525fdba89c0f9251

core/java/android/webkit/WebView.java

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 26dab81..88bb9fc 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -2617,8 +2617,8 @@
             newHeight = 0;
             heightWidthRatio = 0;
         }
-        // Actual visible height.
-        int actualViewHeight = getViewHeight();
+        // Actual visible content height.
+        int actualViewHeight = Math.round(getViewHeight() * mZoomManager.getInvScale());
         // Avoid sending another message if the dimensions have not changed.
         if (newWidth != mLastWidthSent || newHeight != mLastHeightSent || force ||
                 actualViewHeight != mLastActualHeightSent) {