summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortkent@google.com <tkent@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-21 03:40:40 +0000
committertkent@google.com <tkent@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-21 03:40:40 +0000
commit53aacae5fea0264040b0d0a5cdd40e202527b80d (patch)
treee0a7d3d6e06be4ba613898f526fcfcbaf631d047
parent147ff124dd90f6d70f203cfe5c08816e3b533392 (diff)
downloadchromium_src-53aacae5fea0264040b0d0a5cdd40e202527b80d.zip
chromium_src-53aacae5fea0264040b0d0a5cdd40e202527b80d.tar.gz
chromium_src-53aacae5fea0264040b0d0a5cdd40e202527b80d.tar.bz2
WebKit roll 61498:61520
BUG=none TEST=none TBR=dglazkov,hclam Review URL: http://codereview.chromium.org/2856010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50331 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt6
2 files changed, 1 insertions, 7 deletions
diff --git a/DEPS b/DEPS
index 55456bb..9e66bcb 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "61498",
+ "webkit_revision": "61520",
"ffmpeg_revision": "49485",
"skia_revision": "582",
"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 19e4479..0ca4cc3 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -4,9 +4,3 @@
//
// Only add expectations here to temporarily suppress messages on the bots
// until the changes can be landed upstream.
-
-// Need rebaseline because METER_TAG and PROGRESS_TAG were enabled.
-// fast/dom/HTMLProgressElement/*.html and fast/dom/HTMLMeterElement/*.html also
-// need rebaseline.
-BUGTKENT MAC DEBUG : fast/dom/HTMLMeterElement/meter-styles-changing-pseudo.html = IMAGE
-BUGTKENT MAC DEBUG : fast/dom/HTMLMeterElement/meter-styles.html = IMAGE