From 52ab0b39fc7929453e81bd5ffbbf68bd1774fd5c Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Thu, 29 Apr 2010 18:22:24 +0100
Subject: [PATCH] Merge webkit.org at r58033 : Update the WebKit UA string and
 LayoutTest ignore list

Change-Id: I620e6da3f7318f329f3401075799e5659cacda82
---
 core/res/res/values/strings.xml                              | 2 +-
 .../src/com/android/dumprendertree/FileFilter.java           | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 3608b6ff9728f..96d30a30a2d68 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -1624,7 +1624,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 fcb37a054b9fa..0257a5e3ea758 100644
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java
@@ -91,6 +91,11 @@ public class FileFilter {
         ignoreResultList.add("http/tests/appcache/manifest-with-empty-file.html"); // flaky
         ignoreResultList.add("storage/database-lock-after-reload.html"); // Succeeds but DumpRenderTree does not read result correctly
         ignoreResultList.add("storage/hash-change-with-xhr.html"); // Succeeds but DumpRenderTree does not read result correctly
+        ignoreResultList.add("storage/open-database-creation-callback-isolated-world.html"); // Requires layoutTestController.evaluateScriptInIsolatedWorld()
+        ignoreResultList.add("storage/statement-error-callback-isolated-world.html"); // Requires layoutTestController.evaluateScriptInIsolatedWorld()
+        ignoreResultList.add("storage/statement-success-callback-isolated-world.html"); // Requires layoutTestController.evaluateScriptInIsolatedWorld()
+        ignoreResultList.add("storage/transaction-callback-isolated-world.html"); // Requires layoutTestController.evaluateScriptInIsolatedWorld()
+        ignoreResultList.add("storage/transaction-error-callback-isolated-world.html"); // Requires layoutTestController.evaluateScriptInIsolatedWorld()
 
         // Expected failures due to unsupported features.
         ignoreResultList.add("fast/events/touch/touch-coords-in-zoom-and-scroll.html"); // Requires eventSender.zoomPageIn(),zoomPageOut()