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

am c8c78eed: am baa3380d: Fix bug 4170809 - Pages with flash lose touch events

Browse Source 
* commit 'c8c78eed52148441a4a549a9a19914bbbde6ad17':
  Fix bug 4170809 - Pages with flash lose touch events
This commit is contained in:
Adam Powell
2011-03-25 14:49:11 -07:00
committed by Android Git Automerger
parent 70a5b0317d c8c78eed52
commit 7dfc6a9e32
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6056,7 +6056,6 @@ public class WebView extends AbsoluteLayout
if (shouldForwardTouchEvent()) {
if (removeEvents) {
mWebViewCore.removeMessages(EventHub.TOUCH_EVENT);
mTouchEventQueue.ignoreCurrentlyMissingEvents();
}
TouchEventData ted = new TouchEventData();
ted.mIds = new int[1];
@@ -6073,6 +6072,12 @@ public class WebView extends AbsoluteLayout
ted.mSequence = mTouchEventQueue.nextTouchSequence();
mWebViewCore.sendMessage(EventHub.TOUCH_EVENT, ted);
mPreventDefault = PREVENT_DEFAULT_IGNORE;
if (removeEvents) {
// Mark this after sending the message above; we should
// be willing to ignore the cancel event that we just sent.
mTouchEventQueue.ignoreCurrentlyMissingEvents();
}
}
}
@@ -7266,17 +7271,18 @@ public class WebView extends AbsoluteLayout
* been queued will also be processed in their proper order.
*
* @param ted Touch data to be processed in order.
* @return true if the event was processed before returning, false if it was just enqueued.
*/
public void enqueueTouchEvent(TouchEventData ted) {
public boolean enqueueTouchEvent(TouchEventData ted) {
if (ted.mSequence < mLastHandledTouchSequence) {
// Stale event and we already moved on; drop it. (Should not be common.)
Log.w(LOGTAG, "Stale touch event " + MotionEvent.actionToString(ted.mAction) +
" received from webcore; ignoring");
return;
return false;
}
if (dropStaleGestures(ted.mMotionEvent, ted.mSequence)) {
return;
return false;
}
if (mLastHandledTouchSequence + 1 == ted.mSequence) {
@@ -7298,6 +7304,7 @@ public class WebView extends AbsoluteLayout
QueuedTouch qd = obtainQueuedTouch().set(ted);
mTouchEventQueue = mTouchEventQueue == null ? qd : mTouchEventQueue.add(qd);
}
return true;
}
/**
@@ -7851,11 +7858,11 @@ public class WebView extends AbsoluteLayout
}
TouchEventData ted = (TouchEventData) msg.obj;
// WebCore is responding to us; remove pending timeout.
// It will be re-posted when needed.
removeMessages(PREVENT_DEFAULT_TIMEOUT);
mTouchEventQueue.enqueueTouchEvent(ted);
if (mTouchEventQueue.enqueueTouchEvent(ted)) {
// WebCore is responding to us; remove pending timeout.
// It will be re-posted when needed.
removeMessages(PREVENT_DEFAULT_TIMEOUT);
}
break;
case REQUEST_KEYBOARD: