summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorloislo@chromium.org <loislo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-03 15:34:33 +0000
committerloislo@chromium.org <loislo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-03 15:34:33 +0000
commit1b1d870bca786ef6df42e119099b60c633361860 (patch)
tree4bb229b3b6d37506be5cdbfa964ee7357de33eb8
parentf5965773a0783a57aa1ca3f0d649d69794b5b18c (diff)
downloadchromium_src-1b1d870bca786ef6df42e119099b60c633361860.zip
chromium_src-1b1d870bca786ef6df42e119099b60c633361860.tar.gz
chromium_src-1b1d870bca786ef6df42e119099b60c633361860.tar.bz2
WebKit Roll 77471:77484.
TBR=dglazkov BUG=none TEST=none Review URL: http://codereview.chromium.org/6349077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73622 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
2 files changed, 1 insertions, 4 deletions
diff --git a/DEPS b/DEPS
index 8ab60e2..83ba9c9 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": "77471",
+ "webkit_revision": "77484",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
"nacl_revision": "4241",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index d735a62..628ffa3 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -8,6 +8,3 @@
// Registering the fonts for this test causes other processes (Adium, Firefox)
// to spin and become unresponsive or crash.
BUGWK50709 MAC : fast/css/font-weight-1.html = IMAGE+TEXT
-
-// Is failing since r77459. Temporary disabled until rebaseline.
-BUG_LOISLO : scrollbars/custom-scrollbar-with-incomplete-style.html = IMAGE