summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-11-10 17:58:27 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-10 17:58:27 -0800
commit9490fe4095171b9af380812b895101f8142d3cd5 (patch)
tree9e488fe7e6c45b9734828f3e3969dbf533d13b54 /core/java
parent99898de902c36687be126b33ee8a4858d26871ac (diff)
parent9f9fac0ad227941950efd8d09617064e5d4a37be (diff)
downloadframeworks_base-9490fe4095171b9af380812b895101f8142d3cd5.zip
frameworks_base-9490fe4095171b9af380812b895101f8142d3cd5.tar.gz
frameworks_base-9490fe4095171b9af380812b895101f8142d3cd5.tar.bz2
Merge "Fix lastVisible/global rects" into ics-mr1
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/webkit/WebView.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 03d6511..7249497 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -2861,8 +2861,8 @@ public class WebView extends AbsoluteLayout
}
// Used to avoid sending many visible rect messages.
- private Rect mLastVisibleRectSent;
- private Rect mLastGlobalRect;
+ private Rect mLastVisibleRectSent = new Rect();
+ private Rect mLastGlobalRect = new Rect();
private Rect mVisibleRect = new Rect();
private Rect mGlobalVisibleRect = new Rect();
private Point mScrollOffset = new Point();
@@ -2878,7 +2878,7 @@ public class WebView extends AbsoluteLayout
mWebViewCore.sendMessage(EventHub.SET_SCROLL_OFFSET,
nativeMoveGeneration(), mSendScrollEvent ? 1 : 0, mScrollOffset);
}
- mLastVisibleRectSent = mVisibleRect;
+ mLastVisibleRectSent.set(mVisibleRect);
mPrivateHandler.removeMessages(SWITCH_TO_LONGPRESS);
}
if (getGlobalVisibleRect(mGlobalVisibleRect)
@@ -2894,7 +2894,7 @@ public class WebView extends AbsoluteLayout
if (!mBlockWebkitViewMessages) {
mWebViewCore.sendMessage(EventHub.SET_GLOBAL_BOUNDS, mGlobalVisibleRect);
}
- mLastGlobalRect = mGlobalVisibleRect;
+ mLastGlobalRect.set(mGlobalVisibleRect);
}
return mVisibleRect;
}