summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcaseq@google.com <caseq@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 13:18:32 +0000
committercaseq@google.com <caseq@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 13:18:32 +0000
commit855d2b1cfa57c740543e7e1dac8d12efc96a2c43 (patch)
treef37686fe67ce61b7d8b26fd7692d511c1df61dcb
parent05f96749c2e96ef24d428172d49b3ebd5bf5f1d8 (diff)
downloadchromium_src-855d2b1cfa57c740543e7e1dac8d12efc96a2c43.zip
chromium_src-855d2b1cfa57c740543e7e1dac8d12efc96a2c43.tar.gz
chromium_src-855d2b1cfa57c740543e7e1dac8d12efc96a2c43.tar.bz2
Revert "WebKit roll 83807:83834" (broke clang)
BUG=none TEST=none TBR=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81576 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt7
2 files changed, 3 insertions, 6 deletions
diff --git a/DEPS b/DEPS
index eac4f26..3a29f85 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": "83834",
+ "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 53f8c97..0d56b58 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -9,8 +9,5 @@ BUGANTONM : fast/events/window-onerror7.html = TEXT
// Waiting for a V8 roll.
BUGANTONM : plugins/netscape-plugin-property-access-exception.html = TEXT
-// New tests, caseq will rebaseline upstream.
-BUGCASEQ : svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop.html = IMAGE
-BUGCASEQ : svg/dynamic-updates/SVGFEFloodElement-inherit-flood-color.html = IMAGE
-BUGCASEQ : svg/dynamic-updates/SVGFESpecularLightingElement-inherit-lighting-color-css-prop.html = IMAGE
-BUGCASEQ : svg/dynamic-updates/SVGFESpecularLightingElement-lighting-color-css-prop.html = IMAGE
+// Rebaselined upstream, caseq will remove once WebKit is rolled past r83819.
+BUGCASEQ : fast/frames/iframe-outline.html = IMAGE