Cleanup new expectations from my time gardening. Rebaseline 2 tests.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/387040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31855 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 26 insertions, 81 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/events/drag-in-frames-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/events/drag-in-frames-expected.txt
deleted file mode 100644
index 0a2bc61..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/events/drag-in-frames-expected.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Event log
-
-ondragstart src
-ondragenter left target
-ondrag src
-ondragover left target
-ondrag src
-ondragover left target
-ondrag src
-ondragenter right target
-ondragleave left target
-ondrag src
-ondragover right target
-ondrag src
-ondragover right target
-ondrop right target
-ondragend src
-These results are just "sensible" at the moment, meaning that all the events fire on the right elements, nothing more. The order in particular can rightfully change.
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/events/drag-in-frames-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/events/drag-in-frames-expected.txt
deleted file mode 100644
index 0a2bc61..0000000
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/events/drag-in-frames-expected.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Event log
-
-ondragstart src
-ondragenter left target
-ondrag src
-ondragover left target
-ondrag src
-ondragover left target
-ondrag src
-ondragenter right target
-ondragleave left target
-ondrag src
-ondragover right target
-ondrag src
-ondragover right target
-ondrop right target
-ondragend src
-These results are just "sensible" at the moment, meaning that all the events fire on the right elements, nothing more. The order in particular can rightfully change.
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/drag-in-frames-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/drag-in-frames-expected.txt
deleted file mode 100644
index 0a2bc61..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/drag-in-frames-expected.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Event log
-
-ondragstart src
-ondragenter left target
-ondrag src
-ondragover left target
-ondrag src
-ondragover left target
-ondrag src
-ondragenter right target
-ondragleave left target
-ondrag src
-ondragover right target
-ondrag src
-ondragover right target
-ondrop right target
-ondragend src
-These results are just "sensible" at the moment, meaning that all the events fire on the right elements, nothing more. The order in particular can rightfully change.
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/feDisplacementMap-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/feDisplacementMap-expected.checksum
new file mode 100644
index 0000000..f481fc4
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/feDisplacementMap-expected.checksum
@@ -0,0 +1 @@
+b3d8956bcbe2016bbaf9916da987043e
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/feDisplacementMap-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/feDisplacementMap-expected.png
new file mode 100644
index 0000000..42c5ff8
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/feDisplacementMap-expected.png
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index daefbd9..fa370de 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3011,9 +3011,6 @@ BUG_JORLOW LINUX : LayoutTests/fast/multicol/column-rules-stacking.html = PASS F
 // WebKit 50158:50171
 BUG_JORLOW : LayoutTests/fast/dom/error-to-string-stack-overflow.html = FAIL
 
-// Not sure when this started being flaky
-BUG_JAPHET LINUX : LayoutTests/svg/custom/viewport-update2.svg = PASS FAIL
-
 // WebKit roll 50218:50235
 BUG_JORLOW : LayoutTests/http/tests/ssl/referer-301.html = FAIL
 BUG_JORLOW : LayoutTests/http/tests/ssl/referer-303.html = FAIL
@@ -3029,6 +3026,7 @@ BUG26195 LINUX RELEASE : LayoutTests/fast/overflow/overflow_hidden.html = PASS C
 // randomly started to be flaky on r30451 (revision had only a check-in of text_expectations.txt)
 BUG26195 MAC DEBUG : LayoutTests/plugins/netscape-plugin-map-data-to-src.html = PASS TEXT
 BUG26195 MAC DEBUG : LayoutTests/plugins/netscape-plugin-setwindow-size.html = PASS TEXT
+BUG26195 MAC DEBUG : LayoutTests/plugins/netscape-plugin-setwindow-size-2.html = PASS TEXT
 BUG26195 MAC DEBUG : LayoutTests/http/tests/security/xssAuditor/script-tag-addslashes-single-quote.html = PASS TIMEOUT
 
 // ==== WebKit roll 50258:50313 ====
@@ -3063,10 +3061,6 @@ BUG_LEVIN WIN DEBUG : LayoutTests/svg/custom/gradient-stop-style-change.svg = TE
 // Webkit 50667:50696
 BUG_LEVIN : LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-setrequestheader-no-value.html = TEXT
 
-// Webkit 50717:50738, new test
-BUG_JAPHET WIN LINUX : LayoutTests/svg/filters/feDisplacementMap.svg = IMAGE
-BUG26195 MAC DEBUG : LayoutTests/plugins/netscape-plugin-setwindow-size-2.html = PASS TEXT
-
 // more test flakiness
 BUG27335 WIN : LayoutTests/plugins/embed-attributes-setting.html = PASS TIMEOUT
 BUG27334 MAC : LayoutTests/http/tests/misc/xhtml.php = PASS TIMEOUT
@@ -3102,27 +3096,31 @@ BUG27418 MAC DEBUG : LayoutTests/plugins/netscape-identifier-conversion.html = P
 BUG27418 MAC : LayoutTests/plugins/open-and-close-window-with-plugin.html = PASS TEXT
 BUG27418 MAC : LayoutTests/transitions/shorthand-border-transitions.html = PASS TEXT
 
-// Webkit merge 50756:50820
-BUG_JAPHET : LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer.html = TEXT
-BUG_JAPHET : LayoutTests/fast/css/getComputedStyle/computed-style.html = TEXT
-BUG_JAPHET : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-hash.html = TEXT
-BUG_JAPHET : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-host.html = TEXT
-BUG_JAPHET : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-hostname.html = TEXT
-BUG_JAPHET : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-pathname.html = TEXT
-BUG_JAPHET : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-port.html = TEXT
-BUG_JAPHET : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-protocol.html = TEXT
-BUG_JAPHET : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-search.html = TEXT
-BUG_JAPHET : LayoutTests/fast/events/drag-in-frames.html = TEXT
-BUG_JAPHET : LayoutTests/svg/css/getComputedStyle-basic.xhtml = TEXT
+// WebKit r50784 implemented URL decomposition attributes for HTMLAnchorElement, and
+// this exposes a bunch of minor differences in our URL parsing/editing implementation,
+// as well as somethings that might be legitimate bugs.
+BUG27548 : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-hash.html = TEXT
+BUG27548 : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-host.html = TEXT
+BUG27548 : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-hostname.html = TEXT
+BUG27548 : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-pathname.html = TEXT
+BUG27548 : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-port.html = TEXT
+BUG27548 : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-protocol.html = TEXT
+BUG27548 : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-search.html = TEXT
+
+// New tests and regressions related to WebKit r50760 (appeared in WebKit merge 50756:50820).
+BUG27551 : LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer.html = TEXT
+BUG27551 : LayoutTests/fast/css/getComputedStyle/computed-style.html = TEXT
+BUG27551 : LayoutTests/svg/css/getComputedStyle-basic.xhtml = TEXT
 // Add this expectation back in when passing again
 // BUG24182 SLOW DEBUG : LayoutTests/svg/css/getComputedStyle-basic.xhtml = PASS
-BUG_JAPHET : LayoutTests/fast/css/color-correction-backgrounds-and-text.html = FAIL
-BUG_JAPHET : LayoutTests/fast/css/color-correction-on-backgrounds.html = FAIL
-BUG_JAPHET : LayoutTests/fast/css/color-correction-on-text.html = FAIL
-BUG_JAPHET : LayoutTests/fast/css/color-correction.html = FAIL
-BUG_JAPHET WIN : LayoutTests/fast/css/shadow-multiple.html = IMAGE
-BUG_JAPHET WIN MAC : LayoutTests/fast/text/atsui-partial-selection.html = IMAGE
+BUG27551 : LayoutTests/fast/css/color-correction-backgrounds-and-text.html = FAIL
+BUG27551 : LayoutTests/fast/css/color-correction-on-backgrounds.html = FAIL
+BUG27551 : LayoutTests/fast/css/color-correction-on-text.html = FAIL
+BUG27551 : LayoutTests/fast/css/color-correction.html = FAIL
+// May also be related to r50760, but not as confident.
+BUG27551 WIN : LayoutTests/fast/css/shadow-multiple.html = IMAGE
 
-BUG_JAPHET SKIP WIN LINUX : LayoutTests/fast/websockets = FAIL
-BUG_JAPHET SKIP WIN LINUX : LayoutTests/websocket = FAIL
+// WebKit merge 50756:50820, possibly due to WebKit r50808/r50786 and Chromium r31715
+BUG27553 WIN MAC : LayoutTests/fast/text/atsui-partial-selection.html = IMAGE
 
+BUG27556 SKIP WIN LINUX : LayoutTests/websocket/tests = FAIL