summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-19 02:30:49 +0000
committerlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-19 02:30:49 +0000
commit5baaaee351aefbdeaf511a38d8f8a290f4c1c060 (patch)
tree842d045506b3369dfb515e396e4b7c65ed50b043
parentfa960c1f72a62969af15964e0ae4f1e6bf44ad41 (diff)
downloadchromium_src-5baaaee351aefbdeaf511a38d8f8a290f4c1c060.zip
chromium_src-5baaaee351aefbdeaf511a38d8f8a290f4c1c060.tar.gz
chromium_src-5baaaee351aefbdeaf511a38d8f8a290f4c1c060.tar.bz2
WebKit roll 72338:72346.
TEST=None BUG=None TBR=antonm@chromium.org Review URL: http://codereview.chromium.org/5132005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66724 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 c6385dd..feca45f 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": "72338",
+ "webkit_revision": "72346",
"skia_revision": "626",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "40423",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 0ca4cc3..d4d12c1 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -4,3 +4,6 @@
//
// Only add expectations here to temporarily suppress messages on the bots
// until the changes can be landed upstream.
+
+BUG_LEVIN : fast/dom/StyleSheet/gc-inline-style-cssvalues.html = TEXT
+BUG_LEVIN : fast/dom/StyleSheet/gc-styleheet-wrapper.xhtml = TEXT