summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-08 08:17:38 +0000
committertkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-08 08:17:38 +0000
commit031e360993087091690133336d68e6fff8087e0f (patch)
tree4813412347b163453929bc7628a9c054e55971c0
parent93934cfa9b9d24c0901171c4c0e6f81c41bf1df4 (diff)
downloadchromium_src-031e360993087091690133336d68e6fff8087e0f.zip
chromium_src-031e360993087091690133336d68e6fff8087e0f.tar.gz
chromium_src-031e360993087091690133336d68e6fff8087e0f.tar.bz2
WebKit roll 83262:83268
TBR=abarth,jianli TEST=none BUG=none Review URL: http://codereview.chromium.org/6811041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80906 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt12
2 files changed, 1 insertions, 13 deletions
diff --git a/DEPS b/DEPS
index 19b4877..3b3e431 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": "83262",
+ "webkit_revision": "83268",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
"nacl_revision": "4559",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 2f3df0f..0ca4cc3 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -4,15 +4,3 @@
//
// Only add expectations here to temporarily suppress messages on the bots
// until the changes can be landed upstream.
-
-BUGANTONM : fast/events/window-onerror7.html = TEXT
-BUGANTONM : plugins/netscape-plugin-property-access-exception.html = TEXT
-
-// The followings are already rebaselined.
-BUGTKENT MAC : fast/borders/border-radius-circle.html = IMAGE
-BUGTKENT MAC : fast/borders/border-radius-huge-assert.html = IMAGE
-BUGTKENT MAC : fast/box-shadow/border-radius-big.html = IMAGE
-BUGTKENT MAC : fast/box-shadow/inset-with-extraordinary-radii-and-border.html = IMAGE
-BUGTKENT MAC : fast/box-shadow/spread-multiple-inset.html = IMAGE
-BUGTKENT MAC : fast/box-shadow/spread-multiple-normal.html = IMAGE
-BUGTKENT MAC : fast/box-shadow/spread.html = IMAGE