summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-12 12:35:23 +0000
committeryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-12 12:35:23 +0000
commitbb6d7ccf8f1eb2ecff12918de3dd724a520b1440 (patch)
tree17536ff9bb39bc28e88d94cc3a4fca920d478a43
parent9bbf7383ac41691f2715d19b6808e0945bcbab49 (diff)
downloadchromium_src-bb6d7ccf8f1eb2ecff12918de3dd724a520b1440.zip
chromium_src-bb6d7ccf8f1eb2ecff12918de3dd724a520b1440.tar.gz
chromium_src-bb6d7ccf8f1eb2ecff12918de3dd724a520b1440.tar.bz2
WebKit roll to 54706
TBR=jparent Review URL: http://codereview.chromium.org/604032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38889 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
2 files changed, 3 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index f313df9..6d36b4b 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "54653",
+ "webkit_revision": "54706",
"ffmpeg_revision": "38862",
"skia_revision": "490",
"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 c953927..19339dc 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1,4 +1,4 @@
-// This file consists of lines with specifications of what
+ // This file consists of lines with specifications of what
// to expect from layout test cases. The test cases can be directories
// in which case the expectations apply to all test cases in that
// directory and any subdirectory. The format of the file is along the
@@ -2827,6 +2827,7 @@ BUG32682 LINUX : svg/W3C-SVG-1.1/filters-conv-01-f.svg = TEXT PASS
BUG32683 LINUX DEBUG : svg/css/glyph-orientation-rounding-test.xhtml = TEXT PASS
BUG32684 WIN DEBUG : inspector/timeline-layout.html = TEXT PASS
BUG34759 WIN : inspector/console-log-before-inspector-open.html = TEXT PASS
+BUG35519 WIN SKIP : http/tests/inspector/inspect-iframe-from-different-domain.html = PASS
BUG32688 MAC DEBUG : fast/lists/inlineBoxWrapperNullCheck.html = TEXT PASS
BUG32689 MAC LINUX DEBUG : http/tests/security/mixedContent/about-blank-iframe-in-main-frame.html = TEXT PASS
BUG32690 MAC DEBUG : plugins/plugin-remove-subframe.html = TEXT PASS