summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-11 20:18:13 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-11 20:18:13 +0000
commit5d9419f52626a371326cbb70d08763c53147db82 (patch)
treef3272dd8e55d56b1ef53bebe9d6af4ad72caad2e
parent710c31705b2619b5ba4b4c06e0a1257b3bf71a11 (diff)
downloadchromium_src-5d9419f52626a371326cbb70d08763c53147db82.zip
chromium_src-5d9419f52626a371326cbb70d08763c53147db82.tar.gz
chromium_src-5d9419f52626a371326cbb70d08763c53147db82.tar.bz2
Webkit roll 69433:69487
BUG=none TEST=green bots TBR=ajwong@chromium.org Review URL: http://codereview.chromium.org/3669004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62179 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt15
2 files changed, 1 insertions, 16 deletions
diff --git a/DEPS b/DEPS
index 188afde..fac70d2 100644
--- a/DEPS
+++ b/DEPS
@@ -4,7 +4,7 @@ vars = {
"googlecode_url": "http://%s.googlecode.com/svn",
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
- "webkit_revision": "69433",
+ "webkit_revision": "69487",
"skia_revision": "599",
"chromium_git": "http://src.chromium.org/git",
"swig_revision": "40423",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index a385ccb..8e7b8e4 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -7,18 +7,3 @@
BUG_AJWONG WIN : fast/dom/Window/window-screen-properties.html = TEXT
BUG_AJWONG WIN : fast/media/color-does-not-include-alpha.html = TEXT
BUG_AJWONG MAC : fast/css/transformed-mask.html = IMAGE
-
-// Remove these when rolling past r69383.
-BUG10479 DEBUG MAC : svg/hixie/perf/001.xml = FAIL
-BUG10479 DEBUG MAC : svg/hixie/perf/002.xml = FAIL
-
-// Remove these when rolling past r69412
-BUGWEBGL MAC : fast/canvas/webgl/gl-uniform-arrays.html = TEXT
-BUGWEBGL MAC : fast/canvas/webgl/object-deletion-behaviour.html = TEXT
-BUGWEBGL MAC : fast/canvas/webgl/point-size.html = TEXT
-BUGWEBGL MAC : fast/canvas/webgl/gl-object-get-calls.html = TIMEOUT
-BUGWEBGL MAC : fast/canvas/webgl/tex-image-and-uniform-binding-bugs.html = TIMEOUT
-BUGWEBGL MAC : fast/canvas/webgl/uniform-location.html = TIMEOUT
-
-// Remove these after rolling past r69438.
-BUGAJWONG WIN : svg/W3C-SVG-1.1/pservers-grad-17-b.svg = IMAGE+TEXT