Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12f80709 authored by Grace Kloba's avatar Grace Kloba Committed by Android Git Automerger
Browse files

am 3ca122df: am cfb50c66: Merge "If we get TOUCH_UP before getting the... 

am 3ca122df: am cfb50c66: Merge "If we get TOUCH_UP before getting the WebCore\'s response for TOUCH_DOWN, remove the pending TOUCH_EVENT before proceeding to fling." into eclair-mr2

Merge commit '3ca122df'

* commit '3ca122df':
  If we get TOUCH_UP before getting the WebCore's
parents 227df243 3ca122df

core/java/android/webkit/WebView.java

+8 −0
Original line number Diff line number Diff line
@@ -4746,6 +4746,14 @@ public class WebView extends AbsoluteLayout 
                            if (mFullScreenHolder == null

                                    && (computeHorizontalScrollExtent() < computeHorizontalScrollRange()

                                    || computeVerticalScrollExtent() < computeVerticalScrollRange())) {

                                // remove the pending TOUCH_EVENT and send a

                                // cancel

                                mWebViewCore

                                        .removeMessages(EventHub.TOUCH_EVENT);

                                WebViewCore.TouchEventData ted = new WebViewCore.TouchEventData();

                                ted.mAction = MotionEvent.ACTION_CANCEL;

                                mWebViewCore.sendMessage(EventHub.TOUCH_EVENT,

                                        ted);

                                // we will not rewrite drag code here, but we

                                // will try fling if it applies.

                                WebViewCore.reducePriority();