summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-05 20:44:12 +0000
committerdpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-05 20:44:12 +0000
commit9dd75ef64f77c94a1767cf68387393d132510310 (patch)
tree16dbf403a9ce6128faf71246a2863e97db5dc1ce
parent804f29246b1734ddc39cbf42f881fdedc6083983 (diff)
downloadchromium_src-9dd75ef64f77c94a1767cf68387393d132510310.zip
chromium_src-9dd75ef64f77c94a1767cf68387393d132510310.tar.gz
chromium_src-9dd75ef64f77c94a1767cf68387393d132510310.tar.bz2
WebKit roll to r58838.
BUG=none TEST=none R=none Review URL: http://codereview.chromium.org/1979001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46489 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt2
2 files changed, 1 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index 5bdb2f6..6614fa5 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "58820",
+ "webkit_revision": "58838",
"ffmpeg_revision": "46128",
"skia_revision": "561",
"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 9ef81b9..fa10140 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -5,6 +5,4 @@
// Only add expectations here to temporarily suppress messages on the bots
// until the changes can be landed upstream.
-BUGDPRANKE LINUX : svg/custom/mask-changes.svg = IMAGE
-BUGDPRANKE LINUX : http/tests/loading/bad-scheme-subframe.html = TEXT