Commit 022d3254 authored by enrica@apple.com's avatar enrica@apple.com

Some drag and drop tests fail since r76824

https://bugs.webkit.org/show_bug.cgi?id=53304

Reviewed by Adam Roben.

Source/WebCore: 

There were '||' instead of '&&' in the checks for valid
clipboard content.
        
* platform/win/ClipboardWin.cpp:
(WebCore::ClipboardWin::getData):
(WebCore::ClipboardWin::types):
(WebCore::ClipboardWin::files):

LayoutTests: 

Removing platform-specific tests after fixing the cause of the failure.
        
* platform/win/editing/pasteboard/get-data-text-plain-paste-expected.txt: Removed.
* platform/win/editing/pasteboard/onpaste-text-html-expected.txt: Removed.
* platform/win/fast/events/drag-and-drop-dataTransfer-types-nocrash-expected.txt: Removed.
* platform/win/fast/events/ondrop-text-html-expected.txt: Removed.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76961 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent e294cede
2011-01-28 Enrica Casucci <enrica@apple.com>
Reviewed by Adam Roben.
Some drag and drop tests fail since r76824
https://bugs.webkit.org/show_bug.cgi?id=53304
Removing platform-specific tests after fixing the cause of the failure.
* platform/win/editing/pasteboard/get-data-text-plain-paste-expected.txt: Removed.
* platform/win/editing/pasteboard/onpaste-text-html-expected.txt: Removed.
* platform/win/fast/events/drag-and-drop-dataTransfer-types-nocrash-expected.txt: Removed.
* platform/win/fast/events/ondrop-text-html-expected.txt: Removed.
2011-01-28 Jessie Berlin <jberlin@apple.com> 2011-01-28 Jessie Berlin <jberlin@apple.com>
Remove the Windows-specific failing results for media/audio-data-url.html, since it appears Remove the Windows-specific failing results for media/audio-data-url.html, since it appears
This tests that getData is supported for type text/plain during paste. We select "foo", copy it, and then check that on paste getData returns "foo". To run manually, select "foo", copy it, and paste it.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
FAIL Expected: foo
but was: undefined
PASS successfullyParsed is true
TEST COMPLETE
foo
CONSOLE MESSAGE: line 21: text/plain: undefined
CONSOLE MESSAGE: line 23: text/html: undefined
This test verifies that we can get text/html from the clipboard during an onpaste event. This test requires DRT.
Paste content in this div.This test verifies that we can get text/html from the clipboard during an onpaste event. 
FAIL
CONSOLE MESSAGE: line 88: TypeError: 'null' is not an object (evaluating 'event.dataTransfer.types.indexOf')
This test checks that on a successful drop we can access event.dataTransfer.types without crashing.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
TEST COMPLETE
CONSOLE MESSAGE: line 21: text/plain: undefined
CONSOLE MESSAGE: line 23: text/html: undefined
This test verifies that we can get text/html from the drag object during an ondrop event. This test requires DRT.
FAIL
2011-01-28 Enrica Casucci <enrica@apple.com>
Reviewed by Adam Roben.
Some drag and drop tests fail since r76824
https://bugs.webkit.org/show_bug.cgi?id=53304
There were '||' instead of '&&' in the checks for valid
clipboard content.
* platform/win/ClipboardWin.cpp:
(WebCore::ClipboardWin::getData):
(WebCore::ClipboardWin::types):
(WebCore::ClipboardWin::files):
2011-01-28 Martin Robinson <mrobinson@igalia.com> 2011-01-28 Martin Robinson <mrobinson@igalia.com>
[GTK] AudioProcessingEvent.h and JSJavaScriptAudioNode.h: No such file or directory [GTK] AudioProcessingEvent.h and JSJavaScriptAudioNode.h: No such file or directory
...@@ -453,7 +453,7 @@ void ClipboardWin::clearAllData() ...@@ -453,7 +453,7 @@ void ClipboardWin::clearAllData()
String ClipboardWin::getData(const String& type, bool& success) const String ClipboardWin::getData(const String& type, bool& success) const
{ {
success = false; success = false;
if (policy() != ClipboardReadable || !m_dataObject || m_dragDataMap.isEmpty()) if (policy() != ClipboardReadable || (!m_dataObject && m_dragDataMap.isEmpty()))
return ""; return "";
ClipboardDataType dataType = clipboardTypeFromMIMEType(type); ClipboardDataType dataType = clipboardTypeFromMIMEType(type);
...@@ -521,7 +521,7 @@ HashSet<String> ClipboardWin::types() const ...@@ -521,7 +521,7 @@ HashSet<String> ClipboardWin::types() const
if (policy() != ClipboardReadable && policy() != ClipboardTypesReadable) if (policy() != ClipboardReadable && policy() != ClipboardTypesReadable)
return results; return results;
if (!m_dataObject || m_dragDataMap.isEmpty()) if (!m_dataObject && m_dragDataMap.isEmpty())
return results; return results;
if (m_dataObject) { if (m_dataObject) {
...@@ -559,7 +559,7 @@ PassRefPtr<FileList> ClipboardWin::files() const ...@@ -559,7 +559,7 @@ PassRefPtr<FileList> ClipboardWin::files() const
if (policy() != ClipboardReadable && policy() != ClipboardTypesReadable) if (policy() != ClipboardReadable && policy() != ClipboardTypesReadable)
return files.release(); return files.release();
if (!m_dataObject || m_dragDataMap.isEmpty()) if (!m_dataObject && m_dragDataMap.isEmpty())
return files.release(); return files.release();
if (m_dataObject) { if (m_dataObject) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment