summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-18 22:24:37 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-18 22:24:37 +0000
commit3d97a33d158fed99db1fc3d63a891b18acf937db (patch)
treeefec83793a3780e3ff9e72170753f7910dd0cb84 /webkit/tools
parent155e44e2c28188c3adfc8273754773c5615421f3 (diff)
downloadchromium_src-3d97a33d158fed99db1fc3d63a891b18acf937db.zip
chromium_src-3d97a33d158fed99db1fc3d63a891b18acf937db.tar.gz
chromium_src-3d97a33d158fed99db1fc3d63a891b18acf937db.tar.bz2
Fix WebClipboard implementation in test shell to conform to HTML5 spec.
Per Ian Hickson: BTW I noticed Chrome includes "Text" and "URL" in the .types list. That's incorrect according to the spec. Adding a failure suppression to test expectations as well until the expected results are updated in WebKit. BUG=76622 TEST=none Review URL: http://codereview.chromium.org/6713047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78765 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
-rw-r--r--webkit/tools/test_shell/mock_webclipboard_impl.cc1
2 files changed, 3 insertions, 1 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index bae7a01..4d8fa53 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -8,5 +8,8 @@
// Skip these tests until the test_expectations can be updated after this Chromium patch lands.
BUGWK44797 SKIP : fullscreen = PASS FAIL TIMEOUT
+// Skip this test until the expected results are updated upstream.
+BUGWK56621 SKIP : editing/pasteboard/onpaste-text-html-types.html = FAIL
+
// Went from CRASH to TEXT in 78710; this expectation should be upstreamed.
BUG_SENORBLANCO WIN : fast/canvas/webgl/uniform-location.html = TIMEOUT CRASH TEXT
diff --git a/webkit/tools/test_shell/mock_webclipboard_impl.cc b/webkit/tools/test_shell/mock_webclipboard_impl.cc
index eb006f0..c10a32d 100644
--- a/webkit/tools/test_shell/mock_webclipboard_impl.cc
+++ b/webkit/tools/test_shell/mock_webclipboard_impl.cc
@@ -92,7 +92,6 @@ WebVector<WebString> MockWebClipboardImpl::readAvailableTypes(
*containsFilenames = false;
std::vector<WebString> results;
if (!m_plainText.isEmpty()) {
- results.push_back(WebString("Text"));
results.push_back(WebString("text/plain"));
}
if (!m_htmlText.isEmpty()) {