diff options
| author | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-23 21:27:38 +0000 |
|---|---|---|
| committer | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-23 21:27:38 +0000 |
| commit | 7bebf970c86a494bef11bd7a97c2be9917beb0c0 (patch) | |
| tree | 929567052a385b217609ac6322590b873a0db4f3 | |
| parent | 99a77600e4562b69de62a30cf4dfe5501a99ff92 (diff) | |
| download | chromium_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
| -rw-r--r-- | DEPS | 8 | ||||
| -rw-r--r-- | WEBKIT_MERGE_REVISION | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_lists/tests_fixable.txt | 12 |
3 files changed, 17 insertions, 5 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@63", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@7429", + "/trunk/deps/third_party/WebKit@7438", "src/third_party/icu38": "/trunk/deps/third_party/icu38@7121", @@ -21,13 +21,13 @@ deps = { "http://v8.googlecode.com/svn/trunk@968", "src/webkit/data/layout_tests/LayoutTests": - "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39438", + "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39453", "src/third_party/WebKit/WebKit": - "http://svn.webkit.org/repository/webkit/trunk/WebKit@39438", + "http://svn.webkit.org/repository/webkit/trunk/WebKit@39453", "src/third_party/WebKit/WebKitLibraries": - "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39438", + "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39453", } diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index 8185ef3..8a3eda2 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@39438
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@39453
\ No newline at end of file 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 + |