Merge "Take into account the visible title height when scrolling."
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 52c0e01..2a7dc9c 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -6172,6 +6172,9 @@
                     // mContentHeight may not be updated yet
                     y = Math.max(0,
                             (Math.min(maxHeight, y + viewHeight) - viewHeight));
+                    // We need to take into account the visible title height
+                    // when scrolling since y is an absolute view position.
+                    y = Math.max(0, y - getVisibleTitleHeight());
                     scrollTo(x, y);
                     }
                     break;