summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-23 21:27:38 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-23 21:27:38 +0000
commit7bebf970c86a494bef11bd7a97c2be9917beb0c0 (patch)
tree929567052a385b217609ac6322590b873a0db4f3 /webkit
parent99a77600e4562b69de62a30cf4dfe5501a99ff92 (diff)
downloadchromium_src-7bebf970c86a494bef11bd7a97c2be9917beb0c0.zip
chromium_src-7bebf970c86a494bef11bd7a97c2be9917beb0c0.tar.gz
chromium_src-7bebf970c86a494bef11bd7a97c2be9917beb0c0.tar.bz2
Webkit merge 39438:39453 (CL 2 of 2).
Review URL: http://codereview.chromium.org/16249 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7439 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 386302c..dc736ab 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1794,3 +1794,15 @@ LINUX : LayoutTests/fast/transforms/transformed-document-element.html = FAIL
// sideffect from previous test causing it to be flaky. Seems to have
// started with r7379
WIN DEBUG : LayoutTests/editing/execCommand/paste-2.html = PASS FAIL
+
+// Merge 39438:39453 -- new tests.
+LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-004.html = FAIL
+LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-005.html = FAIL
+LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-006.html = FAIL
+LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-007.html = FAIL
+
+// Merge 39438:39453 -- new tests missing expected results. Probably going to
+// fail anyway, since chromium does not support webarchive format.
+SKIP : LayoutTests/webarchive/test-css-url-resources-in-stylesheets.html = FAIL
+SKIP : LayoutTests/webarchive/test-css-url-resources-inline-styles.html = FAIL
+