summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-23 21:44:26 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-23 21:44:26 +0000
commit7745b8c117395b8b1a076fedd261666af222da71 (patch)
tree32d930b331e2d6005a4a1c3a344ab5ea700427d1
parentc94e4aca234b8c4fbdf11c68406e273f5f4cc249 (diff)
downloadchromium_src-7745b8c117395b8b1a076fedd261666af222da71.zip
chromium_src-7745b8c117395b8b1a076fedd261666af222da71.tar.gz
chromium_src-7745b8c117395b8b1a076fedd261666af222da71.tar.bz2
WebKit merge from 49961:49992
Added some blank expectation files and update some failing tests. TBR=jorlow Review URL: http://codereview.chromium.org/337007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29947 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/execCommand/indent-paragraphs-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/execCommand/indent-paragraphs-expected.png0
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-paragraphs-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-paragraphs-expected.png0
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt23
6 files changed, 25 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index cdbe273..ae358ec 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "49961",
+ "webkit_revision": "49992",
"ffmpeg_revision": "28488",
}
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/execCommand/indent-paragraphs-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/execCommand/indent-paragraphs-expected.checksum
new file mode 100644
index 0000000..dadbead
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/execCommand/indent-paragraphs-expected.checksum
@@ -0,0 +1 @@
+0000000000000000000000000000000 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/execCommand/indent-paragraphs-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/execCommand/indent-paragraphs-expected.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/execCommand/indent-paragraphs-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-paragraphs-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-paragraphs-expected.checksum
new file mode 100644
index 0000000..dadbead
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-paragraphs-expected.checksum
@@ -0,0 +1 @@
+0000000000000000000000000000000 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-paragraphs-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-paragraphs-expected.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-paragraphs-expected.png
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index ff1d8d8..ef16aa8 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2633,7 +2633,6 @@ BUG9798 : LayoutTests/fast/forms/submit-to-url-fragment.html = PASS CRASH
BUG9798 : LayoutTests/http/tests/xmlhttprequest/web-apps/003.html = PASS TIMEOUT
BUG9798 LINUX DEBUG : LayoutTests/transitions/zero-duration-in-list.html = PASS TEXT
BUG9798 LINUX DEBUG : LayoutTests/http/tests/multipart/invalid-image-data.html = PASS IMAGE
-BUG9798 WIN LINUX : LayoutTests/fast/dom/defaultView.html = PASS TEXT
BUG9798 LINUX DEBUG : LayoutTests/svg/custom/animate-path-discrete.svg = PASS IMAGE+TEXT
BUG9798 LINUX DEBUG : LayoutTests/transitions/multiple-mask-transitions.html = PASS TEXT
BUG9798 MAC : LayoutTests/http/tests/security/xssAuditor/faux-script1.html = PASS TIMEOUT
@@ -3202,3 +3201,25 @@ BUG_JOHNNYG WIN LINUX : LayoutTests/fast/forms/ValidityState-patternMismatch-001
// Got flaky with Webkit roll 49958:49961
BUG_JOHNNYG LINUX DEBUG : LayoutTests/svg/custom/marker-overflow-clip.svg = PASS TEXT
+
+// WebKit roll 49961:49992
+// Rebaseline after http://trac.webkit.org/changeset/49985
+BUG_TONY : LayoutTests/editing/execCommand/4641880-2.html = FAIL
+BUG_TONY : LayoutTests/editing/execCommand/4916541.html = FAIL
+BUG_TONY : LayoutTests/editing/execCommand/5138441.html = FAIL
+BUG_TONY : LayoutTests/editing/execCommand/5481523.html = FAIL
+BUG_TONY : LayoutTests/editing/execCommand/indent-selection.html = FAIL
+BUG_TONY : LayoutTests/editing/inserting/5994480-2.html = FAIL
+BUG_TONY WIN LINUX : LayoutTests/editing/pasteboard/select-element-1.html = FAIL
+// Added in http://trac.webkit.org/changeset/49990
+BUG_TONY : LayoutTests/fast/dom/Document/CaretRangeFromPoint/caretRangeFromPoint-in-zoom-and-scroll.html = FAIL
+// Missing results
+BUG_TONY : LayoutTests/editing/execCommand/indent-paragraphs.html = FAIL
+BUG_TONY WIN LINUX SKIP : LayoutTests/fast/dom/defaultView.html = FAIL
+// Unknown
+BUG_TONY : LayoutTests/fast/dom/delete-contents.html = FAIL
+BUG_TONY : LayoutTests/fast/js/global-function-resolve.html = FAIL
+BUG_TONY WIN LINUX : LayoutTests/http/tests/security/cross-frame-access-call.html = FAIL
+BUG_TONY : LayoutTests/storage/change-version-handle-reuse.html = FAIL
+BUG_TONY WIN MAC : LayoutTests/storage/change-version.html = TIMEOUT
+BUG_TONY WIN LINUX : LayoutTests/fast/frames/frame-scrolling-attribute.html = CRASH