summaryrefslogtreecommitdiff
path: root/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
diff options
context:
space:
mode:
authorHuahui Wu <hwu@google.com>2010-09-02 13:41:41 -0700
committerHuahui Wu <hwu@google.com>2010-09-26 16:26:38 -0700
commit41865f4b0c5670369bf957ad72a867757fc6b356 (patch)
tree9fb685ee69a192725f03055bbc85a0c6740b506a /tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
parentf4d987893a13212dae7c4bca584a2b20bea9ed4b (diff)
Bug 2372180: pass multi-touch events from browser to webkit.
Since the UI uses multi-touch for zooming, the event is passed to webkit only when the webpage doesn't allow zooming. 1. Updated the data structure TouchEventData in WebViewCore.java to take multiple points and used it everywhere. 2. Added a passMultiTouchToWebkit() function to do what its name means. 3. Added the multi-point touch support to dumprendertree. Change-Id: Iafc1aa7b21a587ad26efd2f124b9a66316297ab8
Diffstat (limited to 'tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java')
-rw-r--r--tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
index 40af8c042ea0..19815fdb74ed 100644
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
@@ -145,6 +145,10 @@ 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();