Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix lastVisible/global rects" into ics-mr1

Browse Source
This commit is contained in:
John Reck
2011-11-10 17:58:27 -08:00
committed by Android (Google) Code Review
parent 99898de902 9f9fac0ad2
commit 9490fe4095
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/webkit/WebView.java
View File

@@ -2861,8 +2861,8 @@ public class WebView extends AbsoluteLayout
} }
// Used to avoid sending many visible rect messages. // Used to avoid sending many visible rect messages.
private Rect mLastVisibleRectSent; private Rect mLastVisibleRectSent = new Rect();
private Rect mLastGlobalRect; private Rect mLastGlobalRect = new Rect();
private Rect mVisibleRect = new Rect(); private Rect mVisibleRect = new Rect();
private Rect mGlobalVisibleRect = new Rect(); private Rect mGlobalVisibleRect = new Rect();
private Point mScrollOffset = new Point(); private Point mScrollOffset = new Point();
@@ -2878,7 +2878,7 @@ public class WebView extends AbsoluteLayout
mWebViewCore.sendMessage(EventHub.SET_SCROLL_OFFSET, mWebViewCore.sendMessage(EventHub.SET_SCROLL_OFFSET,
nativeMoveGeneration(), mSendScrollEvent ? 1 : 0, mScrollOffset); nativeMoveGeneration(), mSendScrollEvent ? 1 : 0, mScrollOffset);
} }
mLastVisibleRectSent = mVisibleRect; mLastVisibleRectSent.set(mVisibleRect);
mPrivateHandler.removeMessages(SWITCH_TO_LONGPRESS); mPrivateHandler.removeMessages(SWITCH_TO_LONGPRESS);
} }
if (getGlobalVisibleRect(mGlobalVisibleRect) if (getGlobalVisibleRect(mGlobalVisibleRect)
@@ -2894,7 +2894,7 @@ public class WebView extends AbsoluteLayout
if (!mBlockWebkitViewMessages) { if (!mBlockWebkitViewMessages) {
mWebViewCore.sendMessage(EventHub.SET_GLOBAL_BOUNDS, mGlobalVisibleRect); mWebViewCore.sendMessage(EventHub.SET_GLOBAL_BOUNDS, mGlobalVisibleRect);
} }
mLastGlobalRect = mGlobalVisibleRect; mLastGlobalRect.set(mGlobalVisibleRect);
} }
return mVisibleRect; return mVisibleRect;
} }