summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsteveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-21 14:11:33 +0000
committersteveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-21 14:11:33 +0000
commit8c99e1f1d2333b72a31614dc8c6c8664edc83d91 (patch)
tree199a44a87dc0b284182d6501cc6ad523e4d0b96b
parent49942c1e913e4e5fc11c8724933a5fb915746523 (diff)
downloadchromium_src-8c99e1f1d2333b72a31614dc8c6c8664edc83d91.zip
chromium_src-8c99e1f1d2333b72a31614dc8c6c8664edc83d91.tar.gz
chromium_src-8c99e1f1d2333b72a31614dc8c6c8664edc83d91.tar.bz2
Roll WebKit 100825:100904
TBR=adamk Review URL: http://codereview.chromium.org/8614001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110913 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 b9f1de0..5fbb51d 100644
--- a/DEPS
+++ b/DEPS
@@ -5,7 +5,7 @@ vars = {
"sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s",
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
- "webkit_revision": "100825",
+ "webkit_revision": "100904",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
"nacl_revision": "7169",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 707c890..73ed923 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.
+
+BUGWK72651 LINUX DEBUG : inspector/styles/show-user-agent-styles.html = CRASH PASS TIMEOUT