summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhamaji@chromium.org <hamaji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-27 11:36:14 +0000
committerhamaji@chromium.org <hamaji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-27 11:36:14 +0000
commitcdc0f453e298e132beabaa4bc53a53b91b31b4aa (patch)
tree6e46364cd58bbdcfc7101f5ab18d1db827bde5d6
parent1c1c5b83d734a9a1415ebb1ae2dc68add1c77081 (diff)
downloadchromium_src-cdc0f453e298e132beabaa4bc53a53b91b31b4aa.zip
chromium_src-cdc0f453e298e132beabaa4bc53a53b91b31b4aa.tar.gz
chromium_src-cdc0f453e298e132beabaa4bc53a53b91b31b4aa.tar.bz2
WebKit roll 74679:74680
BUG=none TEST=none Review URL: http://codereview.chromium.org/6099001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70191 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt1
2 files changed, 1 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 7b87278..cece090 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": "74679",
+ "webkit_revision": "74680",
"skia_revision": "636",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 0cf322b..3dc960d 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -9,4 +9,3 @@ BUGCR64371 WIN RELEASE : http/tests/appcache/online-whitelist.html = TEXT
BUGPKASTING WIN MAC DEBUG SLOW: fast/encoding/parser-tests.html = PASS
BUGCR68046 LINUX DEBUG SLOW: fast/encoding/parser-tests.html = TEXT
BUGCR67463 MAC : editing/selection/caret-mode-paragraph-keys-navigation.html = TEXT
-BUGCR68067 LINUX DEBUG : fast/canvas/webgl/tex-image-with-format-and-type.html = TEXT