summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 22:49:08 +0000
committerdglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 22:49:08 +0000
commit8e7d02ba9961428de8cff357f062f7cfdcc5524f (patch)
tree19aeae454b2b3387bc75059c5348e70846cd9e2b
parent54b998ee6cb9a32c1eef939d5ecb71ecd7528759 (diff)
downloadchromium_src-8e7d02ba9961428de8cff357f062f7cfdcc5524f.zip
chromium_src-8e7d02ba9961428de8cff357f062f7cfdcc5524f.tar.gz
chromium_src-8e7d02ba9961428de8cff357f062f7cfdcc5524f.tar.bz2
WebKit Roll 56239:56272.
TBR=japhet TEST=none BUG=srsly Review URL: http://codereview.chromium.org/1095006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42163 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 cdd0007..3f54056 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "56239",
+ "webkit_revision": "56272",
"ffmpeg_revision": "42082",
"skia_revision": "504",
"chromium_git": "http://src.chromium.org/git",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 9110c44..8537638 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -487,7 +487,6 @@ WONTFIX SKIP : fast/frames/flattening = TIMEOUT
// This should be tested differently (see discussion on https://bugs.webkit.org/show_bug.cgi?id=35063).
// No need to waste cycles implementing harness support for this variant of the test.
-WONTFIX SKIP : fast/loader/api-test-new-window-data-load-base-url.html = TEXT
WONTFIX SKIP : fast/loader/api-test-go-to-current-back-forward-item.html = TIMEOUT
// We're not planning to support rocker-based cursor navigation.