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

Delay resetting mPreventDrag flags so that the Plugin

Browse Source 
will have more time to respond whether it wants to
handle the touch events. (not have to return the
value from WebViewCore before the first tap is up)

Fix a potential null pointer exception.
This commit is contained in:
Grace Kloba
2010-01-25 18:36:48 -08:00
parent 77dc179baa
commit caf0ce3ca2
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4443,14 +4443,11 @@ public class WebView extends AbsoluteLayout
break;
}
} else {
if (mPreventDrag == PREVENT_DRAG_MAYBE_YES) {
// if mPreventDrag is not confirmed, treat it as
// no so that it won't block tap or double tap.
mPreventDrag = PREVENT_DRAG_NO;
mPreventLongPress = false;
mPreventDoubleTap = false;
}
if (mPreventDrag == PREVENT_DRAG_NO) {
// mPreventDrag can be PREVENT_DRAG_MAYBE_YES in
// TOUCH_INIT_MODE. To give WebCoreThread a little
// more time to send PREVENT_TOUCH_ID, we check
// again in responding RELEASE_SINGLE_TAP.
if (mPreventDrag != PREVENT_DRAG_YES) {
if (mTouchMode == TOUCH_INIT_MODE) {
mPrivateHandler.sendMessageDelayed(
mPrivateHandler.obtainMessage(
@@ -5444,6 +5441,13 @@ public class WebView extends AbsoluteLayout
break;
}
case RELEASE_SINGLE_TAP: {
if (mPreventDrag == PREVENT_DRAG_MAYBE_YES) {
// if mPreventDrag is not confirmed, treat it as
// no so that it won't block tap.
mPreventDrag = PREVENT_DRAG_NO;
mPreventLongPress = false;
mPreventDoubleTap = false;
}
if (mPreventDrag == PREVENT_DRAG_NO) {
mTouchMode = TOUCH_DONE_MODE;
doShortPress();
@@ -5807,6 +5811,11 @@ public class WebView extends AbsoluteLayout
mFullScreenHolder.setCancelable(false);
mFullScreenHolder.setCanceledOnTouchOutside(false);
mFullScreenHolder.show();
} else if (mFullScreenHolder == null) {
// this may happen if user dismisses the fullscreen and
// then the WebCore re-position message finally reached
// the UI thread.
break;
}
// move the matching embedded view fully into the view so
// that touch will be valid instead of rejected due to out