diff options
| author | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-04 01:46:31 +0000 |
|---|---|---|
| committer | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-04 01:46:31 +0000 |
| commit | 519c492fc66735bf2542edc457337cf27abc3bf9 (patch) | |
| tree | ba7872bf9a2d1a1b6a855e9e6878876e5e8a991c | |
| parent | f9aadbafb339148d75b6eb0807d9f374554658c7 (diff) | |
| download | chromium_src-519c492fc66735bf2542edc457337cf27abc3bf9.zip chromium_src-519c492fc66735bf2542edc457337cf27abc3bf9.tar.gz chromium_src-519c492fc66735bf2542edc457337cf27abc3bf9.tar.bz2 | |
Chromium side of WebKit merge 41362:41402.
Review URL: http://codereview.chromium.org/39096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10854 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | WEBKIT_MERGE_REVISION | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_lists/tests_fixable.txt | 45 |
3 files changed, 48 insertions, 3 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "41362", + "webkit_revision": "41402", } @@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@167", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@10784", + "/trunk/deps/third_party/WebKit@10853", "src/third_party/icu38": "/trunk/deps/third_party/icu38@10692", diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index c5086e4..c257d12 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@41362
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@41402
\ 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 682a695..75a1e8f 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -1856,3 +1856,48 @@ DEFER : LayoutTests/http/tests/xmlhttprequest/workers/methods-async.html = TIMEO DEFER : LayoutTests/http/tests/xmlhttprequest/workers/methods.html = TIMEOUT DEFER LINUX WIN : LayoutTests/fast/layers/inline-dirty-z-order-lists.html = FAIL DEFER LINUX WIN : LayoutTests/transforms/no_transform_hit_testing.html = FAIL + +// Regression from the 41362:41402 merge, apparently from the V8Bindings +// changes. +LayoutTests/fast/xpath/4XPath/Borrowed/cz_20030217.html = FAIL +LayoutTests/fast/xpath/4XPath/Borrowed/kd_20010423.html = FAIL +LayoutTests/fast/xpath/4XPath/Borrowed/namespace-nodes.html = FAIL +LayoutTests/fast/xpath/4XPath/Borrowed/od_20000608.html = FAIL +LayoutTests/fast/xpath/4XPath/Borrowed/rs_20010831.html = FAIL +LayoutTests/fast/xpath/4XPath/Borrowed/sr_20021217.html = FAIL +LayoutTests/fast/xpath/4XPath/Core/test_boolean_expr.html = FAIL +LayoutTests/fast/xpath/4XPath/Core/test_core_functions.html = FAIL +LayoutTests/fast/xpath/4XPath/Core/test_literal_expr.html = FAIL +LayoutTests/fast/xpath/4XPath/Core/test_location_path.html = FAIL +LayoutTests/fast/xpath/4XPath/Core/test_node_test.html = FAIL +LayoutTests/fast/xpath/4XPath/Core/test_nodeset_expr.html = FAIL +LayoutTests/fast/xpath/4XPath/Core/test_parser.html = FAIL +LayoutTests/fast/xpath/4XPath/Core/test_predicate_list.html = FAIL +LayoutTests/fast/xpath/4XPath/Core/test_step.html = FAIL +LayoutTests/fast/xpath/ancestor-axis.html = FAIL +LayoutTests/fast/xpath/attr-namespace.html = FAIL +LayoutTests/fast/xpath/complex-id.html = FAIL +LayoutTests/fast/xpath/document-order.html = FAIL +LayoutTests/fast/xpath/ensure-null-namespace.xhtml = FAIL +LayoutTests/fast/xpath/id-path.html = FAIL +LayoutTests/fast/xpath/implicit-node-args.html = FAIL +LayoutTests/fast/xpath/namespace-vs-predicate.xhtml = FAIL +LayoutTests/fast/xpath/nan-to-boolean.html = FAIL +LayoutTests/fast/xpath/nodeset-duplicates.html = FAIL +LayoutTests/fast/xpath/nsresolver-function.xhtml = FAIL +LayoutTests/fast/xpath/nsresolver-object.xhtml = FAIL +LayoutTests/fast/xpath/preceding-axis.xhtml = FAIL +LayoutTests/fast/xpath/reverse-axes.html = FAIL +LayoutTests/fast/xpath/string-value.html = FAIL +LayoutTests/fast/xpath/substring-after.html = FAIL +LayoutTests/fast/xpath/text-nodes.html = FAIL +LayoutTests/fast/xpath/union-context-node.xhtml = FAIL +LayoutTests/fast/xpath/xpath-functional-test.html = FAIL + +// New tests added in the 41362:41402 merge. +// TODO(pamg): See which only need re-baselining. +DEFER : LayoutTests/fast/block/float/t0905-c414-flt-fit-01-d-g.html = FAIL +DEFER : LayoutTests/fast/block/float/t0905-c5525-fltblck-00-d-ag.html = FAIL +DEFER : LayoutTests/fast/block/float/t0905-c5526-flthw-00-c-g.html = FAIL +DEFER : LayoutTests/fast/dom/Window/custom-constructors.html = FAIL +DEFER : LayoutTests/fast/loader/main-document-url-for-non-http-loads.html = FAIL |