summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-31 00:24:31 +0000
committerjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-31 00:24:31 +0000
commitf06843b3d86cef6ace44c9e6e61156401a56c863 (patch)
tree694dae744cfd4b1a236fb9949dad83a985b71501
parent3a99802be0067b190240a5689a3e10cc35d8f80e (diff)
downloadchromium_src-f06843b3d86cef6ace44c9e6e61156401a56c863.zip
chromium_src-f06843b3d86cef6ace44c9e6e61156401a56c863.tar.gz
chromium_src-f06843b3d86cef6ace44c9e6e61156401a56c863.tar.bz2
Webkit roll to 50358.
BUG=none TEST=none TBR=rolandsteiner Review URL: http://codereview.chromium.org/348030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30653 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/storage/open-database-set-empty-version-expected.txt2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/storage/open-database-set-empty-version-expected.txt2
3 files changed, 5 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 602d935..4507af8 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "50324",
+ "webkit_revision": "50358",
"ffmpeg_revision": "30374",
}
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/storage/open-database-set-empty-version-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/storage/open-database-set-empty-version-expected.txt
new file mode 100644
index 0000000..741d41f
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/storage/open-database-set-empty-version-expected.txt
@@ -0,0 +1,2 @@
+This tests that calling openDatabase with an empty version string sets the current version of that database to the empty string and subsequent attempts to open the database with a different expected version throw an exception.
+SUCCESS, an exception was thrown. ReferenceError: openDatabase is not defined
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/storage/open-database-set-empty-version-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/storage/open-database-set-empty-version-expected.txt
new file mode 100644
index 0000000..741d41f
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/storage/open-database-set-empty-version-expected.txt
@@ -0,0 +1,2 @@
+This tests that calling openDatabase with an empty version string sets the current version of that database to the empty string and subsequent attempts to open the database with a different expected version throw an exception.
+SUCCESS, an exception was thrown. ReferenceError: openDatabase is not defined