From cb548eb8eeb5ea85ae2810a916b88fa8702e8ea0 Mon Sep 17 00:00:00 2001 From: "ojan@google.com" Date: Tue, 16 Dec 2008 21:04:58 +0000 Subject: webkit merge 39309:39335 part 2. Review URL: http://codereview.chromium.org/14476 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7096 0039d316-1c4b-4281-b951-d872f2087c98 --- DEPS | 8 ++++---- WEBKIT_MERGE_REVISION | 2 +- webkit/tools/layout_tests/test_lists/tests_fixable.txt | 12 ++++++++++++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/DEPS b/DEPS index a701a00..7fc8241 100644 --- a/DEPS +++ b/DEPS @@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@63", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@7053", + "/trunk/deps/third_party/WebKit@7095", "src/third_party/icu38": "/trunk/deps/third_party/icu38@6780", @@ -21,13 +21,13 @@ deps = { "http://v8.googlecode.com/svn/trunk@968", "src/webkit/data/layout_tests/LayoutTests": - "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39309", + "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39335", "src/third_party/WebKit/WebKit": - "http://svn.webkit.org/repository/webkit/trunk/WebKit@39309", + "http://svn.webkit.org/repository/webkit/trunk/WebKit@39335", "src/third_party/WebKit/WebKitLibraries": - "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39309", + "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39335", } diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index a4ae5be..b845959 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@39309 \ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@39335 \ 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 100fbf5..3dab883 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -2100,3 +2100,15 @@ LINUX WIN DEBUG : LayoutTests/fast/events/standalone-image-drag-to-editable.html MAC DEBUG : LayoutTests/fast/events/standalone-image-drag-to-editable.html = FAIL // Missing expected results. SKIP : LayoutTests/svg/webarchive/svg-cursor-subresources.svg = FAIL + +// Merge 39309:39335 Regressions +LayoutTests/fast/box-sizing/percentage-height.html = FAIL +LayoutTests/fast/forms/001.html = FAIL +LayoutTests/fast/forms/button-default-title.html = FAIL +LayoutTests/fast/forms/control-clip.html = FAIL +LayoutTests/fast/forms/input-first-letter.html = FAIL +LayoutTests/fast/forms/select-baseline.html = FAIL +LayoutTests/svg/custom/animate-path-discrete.svg = FAIL + +// Merge 39309:39335 New Test +LayoutTests/fast/dom/Window/window-custom-prototype.html = FAIL -- cgit v1.1