diff options
| -rw-r--r-- | DEPS | 8 | ||||
| -rw-r--r-- | WEBKIT_MERGE_REVISION | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_lists/tests_fixable.txt | 10 |
3 files changed, 14 insertions, 6 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@167", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@7985", + "/trunk/deps/third_party/WebKit@8006", "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@39829", + "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39880", "src/third_party/WebKit/WebKit": - "http://svn.webkit.org/repository/webkit/trunk/WebKit@39829", + "http://svn.webkit.org/repository/webkit/trunk/WebKit@39880", "src/third_party/WebKit/WebKitLibraries": - "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39829", + "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39880", } diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index 8337aa4..25f6516 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@39829
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@39880
\ 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 a59f2dd..032332a 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -1927,6 +1927,14 @@ LINUX : LayoutTests/svg/custom/viewbox-syntax.svg = FAIL LINUX : chrome/fonts/courier.html = FAIL - // TODO(mmoss): rebaseline this when patterns are drawn correctly. LINUX WIN : LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b.svg = FAIL + +// Merge 39830:39880 - new tests +LayoutTests/plugins/npruntime.html = TIMEOUT + +// Merge 39830:39880 - regressions +LayoutTests/editing/selection/5057506.html = FAIL +LINUX WIN : LayoutTests/fast/events/init-events.html = FAIL + + |