summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsteveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-18 16:57:25 +0000
committersteveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-18 16:57:25 +0000
commitd632447c384fb0228ce4af75b705a32a567b1f2e (patch)
tree338cf6449fbb445983e7f87807bd1bdc9bd84fb5
parentb0d8c81d03a2fa7b6d644776111ee8852ad07bf6 (diff)
downloadchromium_src-d632447c384fb0228ce4af75b705a32a567b1f2e.zip
chromium_src-d632447c384fb0228ce4af75b705a32a567b1f2e.tar.gz
chromium_src-d632447c384fb0228ce4af75b705a32a567b1f2e.tar.bz2
Update WebKit to r100780
TBR=pkasting Review URL: http://codereview.chromium.org/8595013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110704 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt5
2 files changed, 1 insertions, 6 deletions
diff --git a/DEPS b/DEPS
index 493f439..b361fd6 100644
--- a/DEPS
+++ b/DEPS
@@ -5,7 +5,7 @@ vars = {
"sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s",
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
- "webkit_revision": "100508",
+ "webkit_revision": "100780",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
"nacl_revision": "7169",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 9f2a11a..707c890 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -6,8 +6,3 @@
// until the changes can be landed upstream.
// PLEASE DO NOT LEAVE ENTRIES IN THIS FILE FOR MORE THAN 24 HRS.
-
-BUGPKASTING MAC : fast/media/mq-transform-02.html = PASS FAIL
-BUGPKASTING MAC : fast/media/mq-transform-03.html = PASS FAIL
-BUGPKASTING MAC : compositing/plugins/composited-plugin.html = PASS FAIL
-BUGPKASTING MAC : compositing/plugins/small-to-large-composited-plugin.html = PASS FAIL