diff options
| author | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-16 21:14:26 +0000 |
|---|---|---|
| committer | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-16 21:14:26 +0000 |
| commit | d3d60c5b64b64817b18fe08501b3b3fb24c23b58 (patch) | |
| tree | 23ca8ca3542e509441036f450a1af96e7e97e60b | |
| parent | c48cc0bc3009df49126b8ef70164022f68280913 (diff) | |
| download | chromium_src-d3d60c5b64b64817b18fe08501b3b3fb24c23b58.zip chromium_src-d3d60c5b64b64817b18fe08501b3b3fb24c23b58.tar.gz chromium_src-d3d60c5b64b64817b18fe08501b3b3fb24c23b58.tar.bz2 | |
WebKit Merge 39953:39972, Chromium Side.
Review URL: http://codereview.chromium.org/18325
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8215 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 | 15 |
3 files changed, 15 insertions, 10 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@167", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@8202", + "/trunk/deps/third_party/WebKit@8213", "src/third_party/icu38": "/trunk/deps/third_party/icu38@7525", @@ -21,13 +21,13 @@ deps = { "http://v8.googlecode.com/svn/trunk@1095", "src/webkit/data/layout_tests/LayoutTests": - "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39953", + "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39972", "src/third_party/WebKit/WebKit": - "http://svn.webkit.org/repository/webkit/trunk/WebKit@39953", + "http://svn.webkit.org/repository/webkit/trunk/WebKit@39972", "src/third_party/WebKit/WebKitLibraries": - "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39953", + "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39972", } diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index c792733..2a6c2df 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@39953
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@39972
\ 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 93a936f..99426ff 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -1920,8 +1920,13 @@ LayoutTests/transforms/2d/cssmatrix-interface.xhtml = FAIL LayoutTests/animations/combo-transform-translate+scale.html = FAIL // Merge 39913:39933 - regressions -LINUX : LayoutTests/fast/forms/input-appearance-height.html = FAIL -LINUX : LayoutTests/fast/forms/placeholder-pseudo-style.html = FAIL -LINUX : LayoutTests/fast/forms/search-placeholder-value-changed.html = FAIL -LINUX : LayoutTests/fast/replaced/width100percent-searchfield.html = FAIL -
\ No newline at end of file +// See http://crbug.com/6482 +WIN : LayoutTests/fast/forms/searchfield-heights.html = FAIL +LINUX WIN : LayoutTests/fast/forms/input-appearance-height.html = FAIL +LINUX WIN : LayoutTests/fast/forms/placeholder-pseudo-style.html = FAIL +LINUX WIN : LayoutTests/fast/forms/search-placeholder-value-changed.html = FAIL +LINUX WIN : LayoutTests/fast/replaced/width100percent-searchfield.html = FAIL + +// Merge 39953:39972 -- the test actually passes, but test_shell appears to eat +// first few chars. See http://crbug.com/6518 +LayoutTests/fast/dom/css-selectorText.html = FAIL |