diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-07 18:54:49 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-07 18:54:49 +0000 |
| commit | d2bebfbde3e2ff57a822705934abe7b7ac77864a (patch) | |
| tree | 697d8ef175e89404251021bd444da85616e26022 | |
| parent | cddc5241ab3085c5eb82fa65ccb1bb38d962fe46 (diff) | |
| download | chromium_src-d2bebfbde3e2ff57a822705934abe7b7ac77864a.zip chromium_src-d2bebfbde3e2ff57a822705934abe7b7ac77864a.tar.gz chromium_src-d2bebfbde3e2ff57a822705934abe7b7ac77864a.tar.bz2 | |
Rolling Webkit 51724 -> 51772.
Adjusting test expectations also.
TBR=michaeln@chromium.org
BUG=none
Review URL: http://codereview.chromium.org/465100
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33972 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "51724", + "webkit_revision": "51772", "ffmpeg_revision": "33521", "skia_revision": "451", "chromium_git": "http://src.chromium.org/git", diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index ccab51b..f46a13e 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -3119,3 +3119,6 @@ BUG_AJWONG : LayoutTests/svg/carto.net/selectionlist.svg = IMAGE PASS BUG_AJWONG : LayoutTests/tables/mozilla/bugs/bug15933.html = IMAGE PASS BUG_AJWONG WIN : chrome/fast/forms/basic-selects.html = IMAGE BUG_AJWONG WIN :LayoutTests/fast/body-propagation/overflow/004-xhtml.xhtml = IMAGE+TEXT PASS + +// Failres from Webkit merger 51724 -> 51772 +BUG_AJWONG: LayoutTests/http/tests/security/cross-frame-access-getOwnPropertyDescriptor.html = TEXT |