Merge "Bug 3509417 - Refine touch event serialization" into honeycomb-mr1 (1250c94b) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebView.java

+12 −9

Original line number	Diff line number	Diff line
		@@ -5566,7 +5566,7 @@ public class WebView extends AbsoluteLayout
		ted.mReprocess = mDeferTouchProcess;
		ted.mNativeLayer = nativeScrollableLayer(
		contentX, contentY, ted.mNativeLayerRect, null);
		ted.mDontEnqueueResult = true;
		ted.mSequence = mTouchEventQueue.nextTouchSequence();
		mWebViewCore.sendMessage(EventHub.TOUCH_EVENT, ted);
		if (mDeferTouchProcess) {
		// still needs to set them for compute deltaX/Y
		@@ -5613,7 +5613,7 @@ public class WebView extends AbsoluteLayout
		ted.mReprocess = mDeferTouchProcess;
		ted.mNativeLayer = mScrollingLayer;
		ted.mNativeLayerRect.set(mScrollingLayerRect);
		ted.mDontEnqueueResult = true;
		ted.mSequence = mTouchEventQueue.nextTouchSequence();
		mWebViewCore.sendMessage(EventHub.TOUCH_EVENT, ted);
		mLastSentTouchTime = eventTime;
		if (mDeferTouchProcess) {
		@@ -5795,7 +5795,7 @@ public class WebView extends AbsoluteLayout
		ted.mReprocess = mDeferTouchProcess;
		ted.mNativeLayer = mScrollingLayer;
		ted.mNativeLayerRect.set(mScrollingLayerRect);
		ted.mDontEnqueueResult = true;
		ted.mSequence = mTouchEventQueue.nextTouchSequence();
		mWebViewCore.sendMessage(EventHub.TOUCH_EVENT, ted);
		}
		mLastTouchUpTime = eventTime;
		@@ -5818,7 +5818,7 @@ public class WebView extends AbsoluteLayout
		ted.mNativeLayer = nativeScrollableLayer(
		contentX, contentY,
		ted.mNativeLayerRect, null);
		ted.mDontEnqueueResult = true;
		ted.mSequence = mTouchEventQueue.nextTouchSequence();
		mWebViewCore.sendMessage(EventHub.TOUCH_EVENT, ted);
		} else if (mPreventDefault != PREVENT_DEFAULT_YES){
		mZoomManager.handleDoubleTap(mLastTouchX, mLastTouchY);
		@@ -6036,7 +6036,7 @@ public class WebView extends AbsoluteLayout
		ted.mAction = MotionEvent.ACTION_CANCEL;
		ted.mNativeLayer = nativeScrollableLayer(
		x, y, ted.mNativeLayerRect, null);
		ted.mDontEnqueueResult = true;
		ted.mSequence = mTouchEventQueue.nextTouchSequence();
		mWebViewCore.sendMessage(EventHub.TOUCH_EVENT, ted);
		mPreventDefault = PREVENT_DEFAULT_IGNORE;
		}
		@@ -7520,7 +7520,7 @@ public class WebView extends AbsoluteLayout
		ted.mNativeLayer = nativeScrollableLayer(
		ted.mPoints[0].x, ted.mPoints[0].y,
		ted.mNativeLayerRect, null);
		ted.mDontEnqueueResult = true;
		ted.mSequence = mTouchEventQueue.nextTouchSequence();
		mWebViewCore.sendMessage(EventHub.TOUCH_EVENT, ted);
		} else if (mPreventDefault != PREVENT_DEFAULT_YES) {
		mTouchMode = TOUCH_DONE_MODE;
		@@ -7736,9 +7736,12 @@ public class WebView extends AbsoluteLayout
		break;
		}
		TouchEventData ted = (TouchEventData) msg.obj;
		if (!ted.mDontEnqueueResult) {

		// WebCore is responding to us; remove pending timeout.
		// It will be re-posted when needed.
		removeMessages(PREVENT_DEFAULT_TIMEOUT);

		mTouchEventQueue.enqueueTouchEvent(ted);
		}
		break;

		case REQUEST_KEYBOARD:

core/java/android/webkit/WebViewCore.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -827,7 +827,6 @@ final class WebViewCore {
		Rect mNativeLayerRect = new Rect();
		long mSequence;
		boolean mNativeResult;
		boolean mDontEnqueueResult;
		}

		static class GeolocationPermissionsData {