diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-14 08:17:51 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-05-14 08:17:51 -0700 |
| commit | d1f5e9e5c055edb427517e8a36e1fee66d05a897 (patch) | |
| tree | 0e653fd914effbd3531c71c7de96b4a31886fbb1 /tests/DumpRenderTree | |
| parent | 8d3257a7dc10e1b3fda03e00f40d1b65d699ff23 (diff) | |
| parent | f4442311b8398b3f8e9e002e5b80b09d3bf38a1e (diff) | |
| download | frameworks_base-d1f5e9e5c055edb427517e8a36e1fee66d05a897.zip frameworks_base-d1f5e9e5c055edb427517e8a36e1fee66d05a897.tar.gz frameworks_base-d1f5e9e5c055edb427517e8a36e1fee66d05a897.tar.bz2 | |
Merge changes I8da1b801,Id88446d6,I82798d5a
* changes:
Merge Webkit at r58956: Update User agent with new WebKit version.
Merge Webkit at r58956: Update DRT FileFilter.
Merge Webkit at r58956: Plugin code has switched to C99 integer types. See http://trac.webkit.org/changeset/58590
Diffstat (limited to 'tests/DumpRenderTree')
| -rw-r--r-- | tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java b/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java index 41e0b2e..2a8cb02 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java @@ -84,8 +84,6 @@ public class FileFilter { // should pass all tests. They are skipped only temporarily. // TODO: Fix these failing tests and remove them from this list. ignoreResultList.add("fast/events/touch/basic-multi-touch-events.html"); // Requires multi-touch - ignoreResultList.add("fast/events/touch/basic-single-touch-events.html"); // Delta of touch move is not great enough for Android. Fixed upstream in WebKit change 58208. - ignoreResultList.add("fast/events/touch/send-oncancel-event.html"); // Expected output is incorrect. Fixed upstream in WebKit change 58058. ignoreResultList.add("fast/events/touch/touch-target.html"); // Requires multi-touch ignoreResultList.add("http/tests/appcache/empty-manifest.html"); // flaky ignoreResultList.add("http/tests/appcache/foreign-iframe-main.html"); // flaky - skips states |