summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMangesh Ghiware <mghiware@google.com>2012-05-12 16:07:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-12 16:07:37 -0700
commit5794bf2b0ece5dc480513feffcf424d86f44951b (patch)
treeef084b48c56c2bb01afa5c7dca0b4454f4de75fd
parent8c113503669fea3fda44e5672ec027e6b15d438f (diff)
parent05efb04c381e91980c68bcfd409d2994ce849b19 (diff)
downloadframeworks_base-5794bf2b0ece5dc480513feffcf424d86f44951b.zip
frameworks_base-5794bf2b0ece5dc480513feffcf424d86f44951b.tar.gz
frameworks_base-5794bf2b0ece5dc480513feffcf424d86f44951b.tar.bz2
am 05efb04c: Merge "Maintain the anchor at top/left on orientation change." into jb-dev
* commit '05efb04c381e91980c68bcfd409d2994ce849b19': Maintain the anchor at top/left on orientation change.
-rw-r--r--core/java/android/webkit/WebViewClassic.java10
1 files changed, 2 insertions, 8 deletions
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 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
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 +