From f93246923f0a8c85fddb508533d63d59977f75eb Mon Sep 17 00:00:00 2001 From: Huahui Wu Date: Mon, 24 Jan 2011 12:07:37 -0800 Subject: A few small cleanning-ups. 1. Remove mDeferMultiTouch in WebView, it was for testing only but we don't need it now since we always pass MultiTouch to WebKit. 2. Remove the use of mDeferMultiTouch in DRT tests. 3. Correct the index of getX(Y) for the second touch point in the debug string of MotionEvent. Change-Id: Ib63cfc5935af1a169ed26b2b138f74908492bc18 --- .../src/com/android/dumprendertree/TestShellActivity.java | 4 ---- .../src/com/android/dumprendertree2/LayoutTestsExecutor.java | 1 - 2 files changed, 5 deletions(-) (limited to 'tests') diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java index 9c4fa97..3ea4911 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java @@ -158,10 +158,6 @@ public class TestShellActivity extends Activity implements LayoutTestController // WebView::setJsFlags is noop in JSC build. mWebView.setJsFlags("--expose_gc"); - // Always send multitouch events to Webkit since the layout test - // is only for the Webkit not the browser's UI. - mWebView.setDeferMultiTouch(true); - mHandler = new AsyncHandler(); Intent intent = getIntent(); diff --git a/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java b/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java index ce546ec..d9f5dd4 100644 --- a/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java +++ b/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java @@ -372,7 +372,6 @@ public class LayoutTestsExecutor extends Activity { webView.setTouchInterval(-1); webView.clearCache(true); - webView.setDeferMultiTouch(true); WebSettings webViewSettings = webView.getSettings(); webViewSettings.setAppCacheEnabled(true); -- cgit v1.1