diff options
| author | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-05 17:14:52 +0000 |
|---|---|---|
| committer | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-05 17:14:52 +0000 |
| commit | 11e52bce67b61f04f5654caec963d51bdd7b39b5 (patch) | |
| tree | 3cace9eddf0d7ee16d2dd99feec4143fc9477a56 | |
| parent | 5dfe8dcd174ecb6cc4b91de62bb6c0ed80c862ca (diff) | |
| download | chromium_src-11e52bce67b61f04f5654caec963d51bdd7b39b5.zip chromium_src-11e52bce67b61f04f5654caec963d51bdd7b39b5.tar.gz chromium_src-11e52bce67b61f04f5654caec963d51bdd7b39b5.tar.bz2 | |
WebKit Merge 38850:38900, Part 3
Review URL: http://codereview.chromium.org/10425
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6435 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 | 8 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_lists/tests_ignored.txt | 1 |
4 files changed, 14 insertions, 5 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@63", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@6425", + "/trunk/deps/third_party/WebKit@6434", "src/third_party/icu38": "/trunk/deps/third_party/icu38@5827", @@ -21,13 +21,13 @@ deps = { "http://v8.googlecode.com/svn/trunk@911", "src/webkit/data/layout_tests/LayoutTests": - "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@38850", + "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@38900", "src/third_party/WebKit/WebKit": - "http://svn.webkit.org/repository/webkit/trunk/WebKit@38850", + "http://svn.webkit.org/repository/webkit/trunk/WebKit@38900", "src/third_party/WebKit/WebKitLibraries": - "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@38850", + "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@38900", } diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index 9ce7512..88001fc 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@38850
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@38900
\ 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 707d946..760c185 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -2085,5 +2085,13 @@ MAC : LayoutTests/fast/images/animated-background-image-crash.html = TIMEOUT LayoutTests/fast/dom/HTMLDocument/document-open-return-value.html = FAIL LayoutTests/fast/events/dispatchEvent-crash.html = FAIL +// WebKit Merge 38850:38900 regressions +LayoutTests/svg/dynamic-updates/SVGForeignObjectElement-dom-width-attr.html = CRASH + +// WebKit Merge 38850:38900 new tests +LayoutTests/editing/selection/wrapped-line-caret-1.html = FAIL +LayoutTests/editing/selection/wrapped-line-caret-2.html = FAIL +LayoutTests/fast/dom/dom-constructors.html = FAIL + // The test passes on a local build, but fail on buildbot in DEBUG mode only. DEBUG : LayoutTests/editing/execCommand/paste-1.html = FAIL diff --git a/webkit/tools/layout_tests/test_lists/tests_ignored.txt b/webkit/tools/layout_tests/test_lists/tests_ignored.txt index 90bc589..d96bae3 100644 --- a/webkit/tools/layout_tests/test_lists/tests_ignored.txt +++ b/webkit/tools/layout_tests/test_lists/tests_ignored.txt @@ -77,6 +77,7 @@ SKIP : LayoutTests/webarchive/loading = FAIL TIMEOUT LayoutTests/webarchive = PASS LayoutTests/svg/webarchive = FAIL PASS LayoutTests/svg/custom/image-with-prefix-in-webarchive.svg = FAIL PASS +SKIP : LayoutTests/http/tests/webarchive = FAIL PASS // Bug 932737 LayoutTests/webarchive/loading/test-loading-archive.html = TIMEOUT |