summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-31 08:00:50 +0000
committerkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-31 08:00:50 +0000
commit4360b01dca12c3e55855ae67f504bc56f7847678 (patch)
tree0b414847053874fab30c3f018304ec520d2d1688
parentacaa37bbf4636288c74fe7515ba3893cc87cff4a (diff)
downloadchromium_src-4360b01dca12c3e55855ae67f504bc56f7847678.zip
chromium_src-4360b01dca12c3e55855ae67f504bc56f7847678.tar.gz
chromium_src-4360b01dca12c3e55855ae67f504bc56f7847678.tar.bz2
Revert 98932 - WebKit roll 94073:94152.
TBR=apavlov@chromium.org Review URL: http://codereview.chromium.org/7740074 TBR=levin@chromium.org Review URL: http://codereview.chromium.org/7778040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98935 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 ba254b0..720777c 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": "94152",
+ "webkit_revision": "94073",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
"nacl_revision": "6583",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 707c890..083fccb 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -6,3 +6,5 @@
// until the changes can be landed upstream.
// PLEASE DO NOT LEAVE ENTRIES IN THIS FILE FOR MORE THAN 24 HRS.
+BUG_LEVIN : fast/multicol/inherit-column-values.html = MISSING
+BUG_LEVIN : fast/multicol/initial-column-values.html = MISSING