diff options
| author | Steve Block <steveblock@google.com> | 2010-04-26 19:17:30 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-04-27 20:11:29 +0100 |
| commit | 79a81c2d380167cdd34a51a068bb8c8c490b0d6b (patch) | |
| tree | 6713b89ab0ab734b8ef0d2df78d9c502f1e7d857 | |
| parent | 7ce7cfc32da1e5c2774ac62261a738fbb012ea99 (diff) | |
| download | frameworks_base-79a81c2d380167cdd34a51a068bb8c8c490b0d6b.zip frameworks_base-79a81c2d380167cdd34a51a068bb8c8c490b0d6b.tar.gz frameworks_base-79a81c2d380167cdd34a51a068bb8c8c490b0d6b.tar.bz2 | |
Merge webkit.org at r55033 : Update the WebKit UA string and LayoutTest ignore list
Change-Id: I7eab669b404dbd2ab534c14021d4a60db0caa803
| -rw-r--r-- | core/res/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index f37a927..9accda8 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1615,7 +1615,7 @@ <!-- Do not translate. WebView User Agent string --> <string name="web_user_agent" translatable="false"><xliff:g id="x">Mozilla/5.0 (Linux; U; Android %s) - AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1</xliff:g></string> + AppleWebKit/533.6 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.6</xliff:g></string> <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" --> <string name="js_dialog_title">The page at \'<xliff:g id="title">%s</xliff:g>\' says:</string> diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java b/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java index 221b218..e28603e 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java @@ -82,8 +82,10 @@ public class FileFilter { // This first block of tests are for features for which Android // 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-touch-events.html"); // Requires multi-touch - ignoreResultList.add("fast/events/touch/send-oncancel-event.html"); // Expected output is incorrect upstream. See WebKit bug 37830. + 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 ignoreResultList.add("http/tests/appcache/manifest-with-empty-file.html"); // flaky |