summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsenorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-17 21:07:53 +0000
committersenorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-17 21:07:53 +0000
commit6875efd2ee51436b54bdc92d1ee7453034db822f (patch)
tree7885249ff1e3dc7b24cea1e319f66b6e57e64300
parentc6ad274ba318d3d54b40ea6d2873588c0a341a2e (diff)
downloadchromium_src-6875efd2ee51436b54bdc92d1ee7453034db822f.zip
chromium_src-6875efd2ee51436b54bdc92d1ee7453034db822f.tar.gz
chromium_src-6875efd2ee51436b54bdc92d1ee7453034db822f.tar.bz2
Roll WebKit 89132:89145. Also add some temporary suppressions to downstream
test_expectations. BUG=none TEST=none TBR=yutak Review URL: http://codereview.chromium.org/7200015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89550 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt23
2 files changed, 24 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index c06c246..69a8780 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": "89132",
+ "webkit_revision": "89145",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
# These hashes need to be updated when nacl_revision is changed.
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 1f2d4ba..5ab6ab2 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -41,3 +41,26 @@ BUGRICOW : fast/js/function-prototype-descriptor.html = TEXT
// already upstreamed, can delete after roll to r88976?
BUGWK62754 DEBUG SLOW : http/tests/misc/object-embedding-svg-delayed-size-negotiation-2.htm = IMAGE
+
+// Already upstreamed; can delete after roll past r89162 (once the win build
+// breakage has been fixed)
+BUGRNIWA MAC : editing/selection/vertical-lr-ltr-extend-line-backward-br.html = IMAGE PASS
+BUGRNIWA MAC : editing/selection/vertical-lr-ltr-extend-line-forward-br.html = IMAGE PASS
+BUGRNIWA MAC : editing/selection/vertical-rl-ltr-extend-line-backward-br.html = IMAGE PASS
+BUGRNIWA MAC : editing/selection/vertical-rl-ltr-extend-line-backward-p.html = IMAGE PASS
+BUGRNIWA MAC : editing/selection/vertical-rl-ltr-extend-line-backward-wrap.html = IMAGE PASS
+BUGRNIWA MAC : editing/selection/vertical-rl-ltr-extend-line-forward-br.html = IMAGE PASS
+BUGRNIWA MAC : editing/selection/vertical-rl-ltr-extend-line-forward-p.html = IMAGE PASS
+BUGRNIWA MAC : editing/selection/vertical-rl-ltr-extend-line-forward-wrap.html = IMAGE PASS
+
+// This can be removed on rolling past r89169.
+BUGCR86563 : fast/canvas/webgl/glsl-conformance.html = TEXT
+
+// Started crashing in the r89132 roll; canaries seem unaffected.
+BUGCR86570 MAC : http/tests/misc/acid3.html = CRASH
+BUGCR86570 MAC : http/tests/misc/font-face-in-multiple-segmented-faces.html = CRASH
+BUGCR86570 MAC : platform/chromium-linux/fast/text/international/arabic-vertical-offset.html = CRASH
+BUGCR86570 MAC : platform/gtk/fonts/custom-font-missing-glyphs.html = CRASH
+BUGCR86570 MAC : platform/gtk/fonts/font-face-with-complex-text.html = CRASH
+BUGCR86570 MAC : platform/mac/fast/text/myanmar-shaping.html = CRASH
+BUGCR86570 MAC : platform/mac/fast/text/thai-combining-mark-positioning.html = CRASH