diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-14 22:43:38 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-14 22:43:38 +0000 |
| commit | 4ef2170bc994581f69c50f6330de57b9e7cbc619 (patch) | |
| tree | d9330763e668617c21e2113b7ade69d956bbb25d | |
| parent | a3e2bc4122a33a9e71045986e2aebfb89c2a405c (diff) | |
| download | chromium_src-4ef2170bc994581f69c50f6330de57b9e7cbc619.zip chromium_src-4ef2170bc994581f69c50f6330de57b9e7cbc619.tar.gz chromium_src-4ef2170bc994581f69c50f6330de57b9e7cbc619.tar.bz2 | |
Chromium part of WebKit merge 39880:39894
This also adds a batch file for running the merge script since I don't have sh.
Review URL: http://codereview.chromium.org/18061
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8044 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 | 19 | ||||
| -rw-r--r-- | webkit/tools/merge/merge.bat | 1 |
4 files changed, 24 insertions, 6 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@167", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@8024", + "/trunk/deps/third_party/WebKit@8041", "src/third_party/icu38": "/trunk/deps/third_party/icu38@7525", @@ -21,13 +21,13 @@ deps = { "http://v8.googlecode.com/svn/trunk@1040", "src/webkit/data/layout_tests/LayoutTests": - "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39880", + "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39894", "src/third_party/WebKit/WebKit": - "http://svn.webkit.org/repository/webkit/trunk/WebKit@39880", + "http://svn.webkit.org/repository/webkit/trunk/WebKit@39894", "src/third_party/WebKit/WebKitLibraries": - "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39880", + "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39894", } diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index 25f6516..cd79308 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@39880
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@39894
\ 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 281c538..ae5829f 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -894,7 +894,7 @@ LayoutTests/editing/selection/move-left-right.html = FAIL LayoutTests/accessibility = FAIL // Linux pixeltest failure: Image scaling is terrible -LINUX WIN : LayoutTests/fast/borders/border-image-omit-right-slice.html = FAIL +LINUX : LayoutTests/fast/borders/border-image-omit-right-slice.html = FAIL // Border radius not anti-aliased. WIN : LayoutTests/fast/borders/fieldsetBorderRadius.html = FAIL // Linux pixeltest failure: We can't do gradient filled text @@ -1919,4 +1919,21 @@ LayoutTests/plugins/npruntime.html = TIMEOUT LayoutTests/editing/selection/5057506.html = FAIL LINUX WIN : LayoutTests/fast/events/init-events.html = FAIL +// Merge 39880:39894 - regressions +LayoutTests/animations/change-keyframes-name.html = FAIL +LayoutTests/editing/execCommand/paste-1.html = FAIL +// Note: this failed before the merge on Windows, just not crashed. +WIN : LayoutTests/fast/borders/border-image-omit-right-slice.html = CRASH +WIN : LayoutTests/fast/css/css2-system-fonts.html = FAIL +LayoutTests/fast/dom/anchor-toString.html = FAIL +WIN : LayoutTests/fast/dom/object-embed-plugin-scripting.html = FAIL +LayoutTests/fast/js/numeric-conversion.html = FAIL +WIN : LayoutTests/fast/lists/001.html = FAIL +LayoutTests/fast/text/basic/006.html = FAIL +WIN : LayoutTests/fast/text/international/complex-character-based-fallback.html = FAIL +WIN : LayoutTests/fast/text/line-breaks.html = FAIL +LayoutTests/fast/text/text-shadow-extreme-value.html = FAIL +LayoutTests/fast/text/whitespace/026.html = FAIL +LayoutTests/http/tests/security/dataTransfer-set-data-file-url.html = FAIL +WIN : LayoutTests/plugins/embed-attributes-setting.html = FAIL diff --git a/webkit/tools/merge/merge.bat b/webkit/tools/merge/merge.bat new file mode 100644 index 0000000..4168144 --- /dev/null +++ b/webkit/tools/merge/merge.bat @@ -0,0 +1 @@ +@..\..\..\third_party\python_24\python.exe merge.py %*
|