diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-16 19:46:23 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-16 19:46:23 +0000 |
| commit | 79106726b69152f8ef4bb1a711e3c1d9c7e033f6 (patch) | |
| tree | fbad50dbf874742691908623a0865ca6b17bd728 | |
| parent | bab28c0ac56b5b274cecb0a762b372888d7ae30f (diff) | |
| download | chromium_src-79106726b69152f8ef4bb1a711e3c1d9c7e033f6.zip chromium_src-79106726b69152f8ef4bb1a711e3c1d9c7e033f6.tar.gz chromium_src-79106726b69152f8ef4bb1a711e3c1d9c7e033f6.tar.bz2 | |
Chromium side of webkit merge 41709:41733.
Review URL: http://codereview.chromium.org/42242
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11757 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 | 5 |
3 files changed, 8 insertions, 3 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "41709", + "webkit_revision": "41733", } @@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@167", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@11719", + "/trunk/deps/third_party/WebKit@11756", "src/third_party/icu38": "/trunk/deps/third_party/icu38@11496", diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index af69d05..f7496bf 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@41709
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@41733
\ 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 0b94ed2..19a203a 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -2057,3 +2057,8 @@ LINUX : LayoutTests/tables/mozilla_expected_failures/bugs/bug23847.html = FAIL LINUX : LayoutTests/tables/mozilla_expected_failures/bugs/bug32205-4.html = FAIL LINUX : LayoutTests/tables/mozilla_expected_failures/marvin/backgr_fixed-bg.html = FAIL LINUX : LayoutTests/tables/mozilla_expected_failures/marvin/backgr_layers-show.html = FAIL + +// Merge 41709:41733 +// Expectations changed upstream. +pending/security/block-test.html = FAIL +LayoutTests/editing/selection/5354455-2.html = FAIL |