commit 05efb04c381e91980c68bcfd409d2994ce849b19
author Mangesh Ghiware <mghiware@google.com> Sat May 12 16:04:00 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Sat May 12 16:04:00 2012 -0700
tree dc6baf42879e7a4e99a1ec7c4227963fea9ffcf4
parent 5a588dbe6e3d246523d7c04258f0129ba37df069
parent cf034e37733645e166736a383d062ba73a8f9687

Merge "Maintain the anchor at top/left on orientation change." into jb-dev

core/java/android/webkit/WebViewClassic.java

diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
index 057c3d1..eb6b7e3 100644
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -7452,18 +7452,12 @@
 
                 case SHOW_RECT_MSG_ID: {
                     WebViewCore.ShowRectData data = (WebViewCore.ShowRectData) msg.obj;
-                    int x = getScrollX();
                     int left = contentToViewX(data.mLeft);
                     int width = contentToViewDimension(data.mWidth);
                     int maxWidth = contentToViewDimension(data.mContentWidth);
                     int viewWidth = getViewWidth();
-                    if (width < viewWidth) {
-                        // center align
-                        x += left + width / 2 - getScrollX() - viewWidth / 2;
-                    } else {
-                        x += (int) (left + data.mXPercentInDoc * width
-                                - getScrollX() - data.mXPercentInView * viewWidth);
-                    }
+                    int x = (int) (left + data.mXPercentInDoc * width -
+                                   data.mXPercentInView * viewWidth);
                     if (DebugFlags.WEB_VIEW) {
                         Log.v(LOGTAG, "showRectMsg=(left=" + left + ",width=" +
                               width + ",maxWidth=" + maxWidth +