summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
2 files changed, 1 insertions, 4 deletions
diff --git a/DEPS b/DEPS
index 4796880..1b73c14 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": "80351",
+ "webkit_revision": "80364",
"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 c9c68ad..3c9112b 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -21,6 +21,3 @@ BUG_ANTONM MAC : http/tests/security/xss-DENIED-xml-external-entity.xhtml = TEXT
BUG_ANTONM MAC : http/tests/security/xss-DENIED-xsl-external-entity.xml = TEXT
BUG_TONYG MAC : svg/text/font-size-below-point-five.svg = TEXT
-
-// Fixed upstream by r80364
-BUG_PFELDMAN : inspector/timeline/timeline-network-resource.html = PASS TEXT