summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-29 04:31:20 +0000
committerlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-29 04:31:20 +0000
commit40a7729a0123284814dc184113f0cb2221bdb817 (patch)
treebf2ead752da08779d8edb989ca56616fca07fdad
parentb5d2a29868c78d65ca27a04665c6a58db761c7c7 (diff)
downloadchromium_src-40a7729a0123284814dc184113f0cb2221bdb817.zip
chromium_src-40a7729a0123284814dc184113f0cb2221bdb817.tar.gz
chromium_src-40a7729a0123284814dc184113f0cb2221bdb817.tar.bz2
Roll WebKit 48821:48841
BUG=None TEST=None TBR=senorblanco@chromium.org Review URL: http://codereview.chromium.org/254009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27466 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rwxr-xr-xwebkit/tools/layout_tests/test_expectations.txt9
2 files changed, 10 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index bf044a0..a472fb3 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "48821",
+ "webkit_revision": "48841",
"ffmpeg_revision": "26428",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 42f3b89..15c35d9 100755
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2296,3 +2296,12 @@ BUG_LEVIN WIN LINUX : LayoutTests/fast/dom/Range/getClientRects.html = FAIL
BUG_DGLAZKOV : LayoutTests/fast/dom/HTMLInputElement/size-attribute.html = FAIL
BUG23306 WIN : LayoutTests/transitions/repeated-firing-background-color.html = TIMEOUT
+
+// WebKit update 48821:48841
+BUG_JAPHET : LayoutTests/fast/dom/Window/atob-btoa.html = FAIL
+BUG_JAPHET WIN LINUX : LayoutTests/fast/dom/Window/window-lookup-precedence.html = FAIL
+BUG_JAPHET : LayoutTests/fast/events/event-view-toString.html = FAIL
+BUG_JAPHET : LayoutTests/fast/js/eval-cross-window.html = FAIL
+BUG_JAPHET : LayoutTests/fast/js/eval-keyword-vs-function.html = FAIL
+BUG_JAPHET : LayoutTests/fast/js/toString-and-valueOf-override.html = FAIL
+BUG_JAPHET : LayoutTests/http/tests/security/cross-frame-access-custom.html = FAIL