drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure when WebView modified mScrollX/Y directly,

Browse Source 
onScrollChanged() is called so that the View system
can do what it needs to adjust.

As WebView's onScrollChanged will call sendOurVisibleRect(),
we don't need to call it explicitly any more.

Fix http://b/issue?id=2438457
This commit is contained in:
Grace Kloba
2010-04-02 15:38:55 -07:00
parent 61c3a13e5f
commit 327dce9e36
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2066,7 +2066,7 @@ public class WebView extends AbsoluteLayout
mScrollX = pinLocX(mScrollX);
mScrollY = pinLocY(mScrollY);
if (oldX != mScrollX || oldY != mScrollY) {
sendOurVisibleRect();
onScrollChanged(mScrollX, mScrollY, oldX, oldY);
}
if (!mScroller.isFinished()) {
// We are in the middle of a scroll. Repin the final scroll
@ -2130,9 +2130,12 @@ public class WebView extends AbsoluteLayout
mScrollX = pinLocX(Math.round(sx));
mScrollY = pinLocY(Math.round(sy));
if (oldX != mScrollX || oldY != mScrollY) {
onScrollChanged(mScrollX, mScrollY, oldX, oldY);
}
// update webkit
sendViewSizeZoom();
sendOurVisibleRect();
}
}
}
@ -2634,9 +2637,7 @@ public class WebView extends AbsoluteLayout
mScrollY = mScroller.getCurrY();
postInvalidate(); // So we draw again
if (oldX != mScrollX || oldY != mScrollY) {
// As onScrollChanged() is not called, sendOurVisibleRect()
// needs to be called explicitly.
sendOurVisibleRect();
onScrollChanged(mScrollX, mScrollY, oldX, oldY);
}
} else {
super.computeScroll();
@ -3347,8 +3348,10 @@ public class WebView extends AbsoluteLayout
mUserScroll = false;
mWebViewCore.sendMessage(EventHub.SYNC_SCROLL, oldScrollX,
oldScrollY);
onScrollChanged(mScrollX, mScrollY, oldScrollX, oldScrollY);
} else {
sendOurVisibleRect();
}
sendOurVisibleRect();
}
}