summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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