summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-06-21 10:14:02 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-21 10:14:02 -0700
commit5d018ea3485ed308d18e1b1f231d88d3f71c3a79 (patch)
treef79f5e78ca62074cbfe0a0258594ebfa5b059200
parent4fd24e0fc4a8496f3311aa3716bd88c4fb0acc0e (diff)
parenta986589950eeb242293b1597f56fd73f3da99a28 (diff)
downloadexternal_webkit-5d018ea3485ed308d18e1b1f231d88d3f71c3a79.zip
external_webkit-5d018ea3485ed308d18e1b1f231d88d3f71c3a79.tar.gz
external_webkit-5d018ea3485ed308d18e1b1f231d88d3f71c3a79.tar.bz2
Merge changes I1f457d1e,I365930f3,Iad35a220
* changes: Fix storage/transaction-error-callback.html Fix fast/encoding/dumpAsText//utf-16-no-bom.xml Add android-specific result for fast/encoding/meta-in-script.html
-rw-r--r--LayoutTests/platform/android-v8/fast/encoding/meta-in-script-expected.txt3
-rw-r--r--LayoutTests/platform/android-v8/storage/transaction-error-callback-expected.txt4
-rw-r--r--Source/WebKit/android/jni/WebSettings.cpp4
3 files changed, 9 insertions, 2 deletions
diff --git a/LayoutTests/platform/android-v8/fast/encoding/meta-in-script-expected.txt b/LayoutTests/platform/android-v8/fast/encoding/meta-in-script-expected.txt
new file mode 100644
index 0000000..5d5b9f9
--- /dev/null
+++ b/LayoutTests/platform/android-v8/fast/encoding/meta-in-script-expected.txt
@@ -0,0 +1,3 @@
+CONSOLE MESSAGE: line 4: Uncaught SyntaxError: Unexpected token <
+PASS: windows-1255
+This test passes if the charset is parsed from the meta tag outside the script.
diff --git a/LayoutTests/platform/android-v8/storage/transaction-error-callback-expected.txt b/LayoutTests/platform/android-v8/storage/transaction-error-callback-expected.txt
index cbebda9..3cd9dcf 100644
--- a/LayoutTests/platform/android-v8/storage/transaction-error-callback-expected.txt
+++ b/LayoutTests/platform/android-v8/storage/transaction-error-callback-expected.txt
@@ -1,5 +1,5 @@
-CONSOLE MESSAGE: line 63: Uncaught #<an Object>
-CONSOLE MESSAGE: line 63: Uncaught #<an Object>
+CONSOLE MESSAGE: line 63: Uncaught #<Object>
+CONSOLE MESSAGE: line 63: Uncaught #<Object>
This test confirms that SQLTransactionErrorCallback is invoked correctly and regardless of its output, the transaction is always rolled back on failure.
Testing transaction failing mid-way and error callback returning true : SUCCESS
Testing transaction failing mid-way and error callback return false : SUCCESS
diff --git a/Source/WebKit/android/jni/WebSettings.cpp b/Source/WebKit/android/jni/WebSettings.cpp
index 7ba5e96..6f18695 100644
--- a/Source/WebKit/android/jni/WebSettings.cpp
+++ b/Source/WebKit/android/jni/WebSettings.cpp
@@ -567,6 +567,10 @@ public:
}
}
#endif
+
+ // This is required to enable the XMLTreeViewer when loading an XML document that
+ // has no style attached to it. http://trac.webkit.org/changeset/79799
+ s->setDeveloperExtrasEnabled(true);
}
};