summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 17:51:35 +0000
committertonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 17:51:35 +0000
commit27030d8d5d54002e1baaf19fefd909ebfb82de40 (patch)
tree80f4c7556a2e317f750cc5bee69bb53f8e8a3050
parent9bd68ea2016a0c7f71aa470e9ef901e57c6c6420 (diff)
downloadchromium_src-27030d8d5d54002e1baaf19fefd909ebfb82de40.zip
chromium_src-27030d8d5d54002e1baaf19fefd909ebfb82de40.tar.gz
chromium_src-27030d8d5d54002e1baaf19fefd909ebfb82de40.tar.bz2
Roll WebKit 80340:80351.
BUG=none TEST=none Review URL: http://codereview.chromium.org/6632001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76929 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 3b6e5da..4796880 100644
--- a/DEPS
+++ b/DEPS
@@ -4,7 +4,7 @@ vars = {
"googlecode_url": "http://%s.googlecode.com/svn",
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
- "webkit_revision": "80340",
+ "webkit_revision": "80351",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
"nacl_revision": "4382",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index eeacb2c2..27727ec 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -24,3 +24,5 @@ BUG_TONYG MAC : svg/text/font-size-below-point-five.svg = TEXT
// Temporarily get rid of redness
BUG_PKASTING WIN : http/tests/navigation/useragent.php = TEXT
+
+BUG_PFELDMAN : inspector/timeline/timeline-network-resource.html = PASS TEXT