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

Commit ecbfb210 authored by Ben Murdoch's avatar Ben Murdoch
Browse files

Revert "am 3db1ebaf: am 4ed2b1c3: Pass touch event time from Java to WebKit".... 

Revert "am 3db1ebaf: am 4ed2b1c3: Pass touch event time from Java to WebKit". The corresponding change to external/webkit creates a merge conflict in master.

Revert the frameworks/base part of the change so we can "do not merge" the external/webkit change and get the build working again. We can then later resolve
the conflict in external/webkit in master directly.

This reverts commit 9ecd9437, reversing
changes made to 019fe73d.

Change-Id: Id1404fb056b033ebd60529dd326ec9a3c32f94b0
parent 9ecd9437

core/java/android/webkit/WebView.java

+0 −3
Original line number Diff line number Diff line
@@ -4348,7 +4348,6 @@ public class WebView extends AbsoluteLayout 
            ted.mAction = action;

            ted.mX = viewToContentX((int) x + mScrollX);

            ted.mY = viewToContentY((int) y + mScrollY);

            ted.mEventTime = eventTime;

            mWebViewCore.sendMessage(EventHub.TOUCH_EVENT, ted);

            mLastSentTouchTime = eventTime;

        }
@@ -4612,7 +4611,6 @@ public class WebView extends AbsoluteLayout 
                            ted.mAction = WebViewCore.ACTION_DOUBLETAP;

                            ted.mX = viewToContentX((int) x + mScrollX);

                            ted.mY = viewToContentY((int) y + mScrollY);

                            ted.mEventTime = eventTime;

                            mWebViewCore.sendMessage(EventHub.TOUCH_EVENT, ted);

                        } else if (mFullScreenHolder == null) {

                            doDoubleTap();
@@ -5652,7 +5650,6 @@ public class WebView extends AbsoluteLayout 
                        ted.mAction = WebViewCore.ACTION_LONGPRESS;

                        ted.mX = viewToContentX((int) mLastTouchX + mScrollX);

                        ted.mY = viewToContentY((int) mLastTouchY + mScrollY);

                        ted.mEventTime = SystemClock.uptimeMillis();

                        mWebViewCore.sendMessage(EventHub.TOUCH_EVENT, ted);

                    } else if (mPreventDrag == PREVENT_DRAG_NO) {

                        mTouchMode = TOUCH_DONE_MODE;

core/java/android/webkit/WebViewCore.java

+2 −3
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ final class WebViewCore { 
    private native void nativeTouchUp(int touchGeneration,

            int framePtr, int nodePtr, int x, int y);



    private native int nativeHandleTouchEvent(int action, int x, int y, long time);

    private native int nativeHandleTouchEvent(int action, int x, int y);



    private native void nativeUpdateFrameCache();
@@ -731,7 +731,6 @@ final class WebViewCore { 
        int mAction;

        int mX;

        int mY;

        long mEventTime;

    }



    static class GeolocationPermissionsData {
@@ -1190,7 +1189,7 @@ final class WebViewCore { 
                                    mWebView.mPrivateHandler,

                                    WebView.PREVENT_TOUCH_ID, ted.mAction,

                                    nativeHandleTouchEvent(ted.mAction, ted.mX,

                                    ted.mY, ted.mEventTime)).sendToTarget();

                                            ted.mY)).sendToTarget();

                            break;

                        }