summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-15 07:05:23 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-15 07:05:23 +0000
commit855abcba04fa69a7e307c8f1913cd1b549911952 (patch)
tree620803edf68b120602bbde9c46fa833fa9ccef42
parentffaaa45f5cf0f13d8cdde14c27d2ab6a96bcf57b (diff)
downloadchromium_src-855abcba04fa69a7e307c8f1913cd1b549911952.zip
chromium_src-855abcba04fa69a7e307c8f1913cd1b549911952.tar.gz
chromium_src-855abcba04fa69a7e307c8f1913cd1b549911952.tar.bz2
Update WebKit to r48388
This commit introduces a failing webgl test. I added a skip for all webgl tests. TBR=brettw BUG=21852 TEST=none Review URL: http://codereview.chromium.org/196117 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26202 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rwxr-xr-xwebkit/tools/layout_tests/test_expectations.txt3
2 files changed, 4 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 018eef6..1df237b 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "48371",
+ "webkit_revision": "48388",
}
deps = {
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 2224db4..c076e7f 100755
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -114,6 +114,9 @@ WONTFIX SKIP BUG19635 : LayoutTests/fast/dom/Window/timer-resume-on-navigation-b
// Depends on page cache, as far as I can tell.
WONTFIX SKIP BUG10635 : LayoutTests/fast/events/pageshow-pagehide-on-back-cached.html = TIMEOUT FAIL
+// No support for WebGL yet
+BUG21852 SKIP : LayoutTests/fast/canvas/webgl = FAIL
+
// -----------------------------------------------------------------
// FAILING TESTS
// -----------------------------------------------------------------