diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-18 22:39:40 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-18 22:39:40 +0000 |
| commit | 03bbb08c93cf7fd64ac0cc29f43f760af3c8888e (patch) | |
| tree | 801bf19368f691a1a2987550d256ea208d08b607 | |
| parent | 18cd66f0a730b18840f9b9e96282c1308728c16e (diff) | |
| download | chromium_src-03bbb08c93cf7fd64ac0cc29f43f760af3c8888e.zip chromium_src-03bbb08c93cf7fd64ac0cc29f43f760af3c8888e.tar.gz chromium_src-03bbb08c93cf7fd64ac0cc29f43f760af3c8888e.tar.bz2 | |
Update WebKit from r52293 to r52323.
TBR=jparent
BUG=30792
TEST=none
Review URL: http://codereview.chromium.org/501122
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34991 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": "52293", + "webkit_revision": "52323", "ffmpeg_revision": "34297", "skia_revision": "457", "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 d60bb11..8eaaaf3 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -3128,3 +3128,6 @@ BUG29737 LINUX : LayoutTests/svg/filters/feDisplacementMap.svg = TEXT PASS // Newly added test in r52235 BUG_JPARENT WIN LINUX : LayoutTests/editing/selection/doubleclick-beside-cr-span.html = TEXT + +// WebKit update 52293->52323 +BUG30792 : LayoutTests/http/tests/security/xss-DENIED-assign-location-href-javascript.html = TEXT
\ No newline at end of file |