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

Commit 9ab91b84 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 3509417 - Serialize touch event handling in webview" into honeycomb-mr1

parents ef560044 4fb35d4d

core/java/android/webkit/WebView.java

+316 −126

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/webkit/WebViewCore.java

+7 −3
Original line number Diff line number Diff line
@@ -825,6 +825,9 @@ final class WebViewCore { 
        MotionEvent mMotionEvent;

        int mNativeLayer;

        Rect mNativeLayerRect = new Rect();

        long mSequence;

        boolean mNativeResult;

        boolean mDontEnqueueResult;

    }



    static class GeolocationPermissionsData {
@@ -1332,13 +1335,14 @@ final class WebViewCore { 
                                nativeScrollLayer(ted.mNativeLayer,

                                        ted.mNativeLayerRect);

                            }

                            ted.mNativeResult = nativeHandleTouchEvent(ted.mAction, ted.mIds,

                                    xArray, yArray, count, ted.mMetaState);

                            Message.obtain(

                                    mWebView.mPrivateHandler,

                                    WebView.PREVENT_TOUCH_ID,

                                    ted.mAction,

                                    nativeHandleTouchEvent(ted.mAction, ted.mIds,

                                        xArray, yArray, count, ted.mMetaState) ? 1 : 0,

                                    ted.mReprocess ? ted : null).sendToTarget();

                                    ted.mNativeResult ? 1 : 0,

                                    ted).sendToTarget();

                            break;

                        }