summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-29 19:18:27 +0000
committerlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-29 19:18:27 +0000
commitff9f0d5c9173d7a118aed03c8195c2482900ccca (patch)
tree5ab5a63ddd88fedd273c3b8c7668610a35731928
parent9b53e244a18ae925eef73259b53625ffbcaf230e (diff)
downloadchromium_src-ff9f0d5c9173d7a118aed03c8195c2482900ccca.zip
chromium_src-ff9f0d5c9173d7a118aed03c8195c2482900ccca.tar.gz
chromium_src-ff9f0d5c9173d7a118aed03c8195c2482900ccca.tar.bz2
WebKit roll 93977:93984.
TBR=apavlov@chromium.org Review URL: http://codereview.chromium.org/7798001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98670 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 db0148f..7480a229 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": "93977",
+ "webkit_revision": "93993",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
"nacl_revision": "6562",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 707c890..8a4fc10 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 LINUX : inspector/styles/styles-computed-trace.html = TEXT