summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-13 00:31:09 +0000
committerjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-13 00:31:09 +0000
commit3fc061bf7d66db91ad6e2357420f0e16ffcb3827 (patch)
treeddec6bf25048945d3c42909a203b8a490c3c46b2
parentb76be6c790b8f26ff68c2a15a29bfc3c41ed8088 (diff)
downloadchromium_src-3fc061bf7d66db91ad6e2357420f0e16ffcb3827.zip
chromium_src-3fc061bf7d66db91ad6e2357420f0e16ffcb3827.tar.gz
chromium_src-3fc061bf7d66db91ad6e2357420f0e16ffcb3827.tar.bz2
WebKit Roll 55853:55940
BUG=none TEST=none TBR=yutak git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41513 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt27
2 files changed, 27 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 56ab65e..33d3b48 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "55853",
+ "webkit_revision": "55940",
"ffmpeg_revision": "40718",
"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 1665d87..8685090 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2828,7 +2828,6 @@ BUG37896 WIN LINUX : editing/pasteboard/paste-text-at-tabspan-001.html = TEXT
BUG37896 WIN LINUX : editing/pasteboard/paste-text-at-tabspan-002.html = TEXT
BUG37896 WIN LINUX : editing/style/font-family-with-space.html = TEXT
BUG37896 WIN LINUX : editing/style/smoosh-styles-001.html = TEXT
-BUG37896 WIN LINUX : editing/style/style-boundary-005.html = TEXT
BUG37896 WIN : editing/undo/undo-smart-delete-word.html = TEXT
BUG37896 MAC LINUX : fast/backgrounds/animated-svg-as-background.html = IMAGE
BUG37896 MAC LINUX : fast/dom/Window/window-appendages-cleared.html = TEXT
@@ -2868,3 +2867,29 @@ BUG_DGLAZKOV MAC LINUX : fast/dom/HTMLAnchorElement/set-href-attribute-hostname.
BUG_DGLAZKOV MAC LINUX : fast/dom/HTMLAnchorElement/set-href-attribute-port.html = TEXT
BUG_DGLAZKOV MAC LINUX : fast/loader/url-parse-1.html = TEXT
+// WebKit roll r55853 -> 55940
+// Need rebaseline
+BUG_JIANLI WIN LINUX : editing/deleting/non-smart-delete.html = IMAGE+TEXT
+BUG_JIANLI WIN LINUX : editing/deleting/smart-delete-001.html = TEXT
+BUG_JIANLI WIN LINUX : editing/deleting/smart-delete-002.html = FAIL
+BUG_JIANLI WIN LINUX : editing/deleting/smart-delete-003.html = IMAGE+TEXT
+BUG_JIANLI WIN LINUX : editing/deleting/smart-delete-004.html = IMAGE+TEXT
+BUG_JIANLI WIN LINUX : editing/pasteboard/drag-drop-modifies-page.html = IMAGE+TEXT
+BUG_JIANLI WIN LINUX : editing/pasteboard/smart-drag-drop.html = IMAGE+TEXT
+BUG_JIANLI WIN LINUX : editing/pasteboard/smart-paste-001.html = TEXT
+BUG_JIANLI WIN LINUX : editing/pasteboard/smart-paste-002.html = TEXT
+BUG_JIANLI WIN LINUX : editing/pasteboard/smart-paste-003.html = FAIL
+BUG_JIANLI WIN LINUX : editing/pasteboard/smart-paste-004.html = FAIL
+BUG_JIANLI WIN LINUX : editing/pasteboard/smart-paste-005.html = TEXT
+BUG_JIANLI WIN LINUX : editing/pasteboard/smart-paste-007.html = TEXT
+BUG_JIANLI WIN LINUX : editing/pasteboard/smart-paste-008.html = TEXT
+BUG_JIANLI WIN LINUX : editing/style/style-boundary-005.html = FAIL
+
+// Flaky test
+BUG_JIANLI MAC : fast/forms/select-style.html = IMAGE PASS
+
+// Need investigation
+BUG_JIANLI : plugins/round-trip-npobject.html = TEXT
+BUG_JIANLI WIN LINUX : fast/text/international/plane2.html = IMAGE+TEXT
+BUG_JIANLI WIN LINUX : svg/W3C-SVG-1.1/pservers-grad-17-b.svg = TEXT
+BUG_JIANLI WIN LINUX : svg/custom/dominant-baseline-hanging.svg = TEXT