summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcaseq@google.com <caseq@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 06:33:29 +0000
committercaseq@google.com <caseq@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 06:33:29 +0000
commita7d8402284ac4de48b54eacc5061163a39bb6e51 (patch)
treead8a2b6adf6438fd05e8b78f667ca80aa2ff4095
parent287967e8a98df687e88b4460baf648a37a5e3a2d (diff)
downloadchromium_src-a7d8402284ac4de48b54eacc5061163a39bb6e51.zip
chromium_src-a7d8402284ac4de48b54eacc5061163a39bb6e51.tar.gz
chromium_src-a7d8402284ac4de48b54eacc5061163a39bb6e51.tar.bz2
WebKit roll 83754:83807
BUG=none TEST=none TBR=crogers Review URL: http://codereview.chromium.org/6853007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81544 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
2 files changed, 4 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index c70c10b..c0a1df8 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": "83754",
+ "webkit_revision": "83807",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
"nacl_revision": "4559",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index ea925f2..0d56b58 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -8,3 +8,6 @@
BUGANTONM : fast/events/window-onerror7.html = TEXT
// Waiting for a V8 roll.
BUGANTONM : plugins/netscape-plugin-property-access-exception.html = TEXT
+
+// Rebaselined upstream, caseq will remove once WebKit is rolled past r83819.
+BUGCASEQ : fast/frames/iframe-outline.html = IMAGE