[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
enrica at apple.com
enrica at apple.com
Mon Feb 21 00:10:51 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 022d3254be8ddbb4bec212c77b14d873c6533801
Author: enrica at apple.com <enrica at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 28 19:46:19 2011 +0000
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
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d02f725..536a9cf 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-28 Enrica Casucci <enrica at 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 at apple.com>
Remove the Windows-specific failing results for media/audio-data-url.html, since it appears
diff --git a/LayoutTests/platform/win/editing/pasteboard/get-data-text-plain-paste-expected.txt b/LayoutTests/platform/win/editing/pasteboard/get-data-text-plain-paste-expected.txt
deleted file mode 100644
index 1cee8b6..0000000
--- a/LayoutTests/platform/win/editing/pasteboard/get-data-text-plain-paste-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-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
diff --git a/LayoutTests/platform/win/editing/pasteboard/onpaste-text-html-expected.txt b/LayoutTests/platform/win/editing/pasteboard/onpaste-text-html-expected.txt
deleted file mode 100644
index 7fec87f..0000000
--- a/LayoutTests/platform/win/editing/pasteboard/onpaste-text-html-expected.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-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
-
diff --git a/LayoutTests/platform/win/fast/events/drag-and-drop-dataTransfer-types-nocrash-expected.txt b/LayoutTests/platform/win/fast/events/drag-and-drop-dataTransfer-types-nocrash-expected.txt
deleted file mode 100644
index 2ae8942..0000000
--- a/LayoutTests/platform/win/fast/events/drag-and-drop-dataTransfer-types-nocrash-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-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
-
diff --git a/LayoutTests/platform/win/fast/events/ondrop-text-html-expected.txt b/LayoutTests/platform/win/fast/events/ondrop-text-html-expected.txt
deleted file mode 100644
index d7c3d8b..0000000
--- a/LayoutTests/platform/win/fast/events/ondrop-text-html-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 9f2c506..bf1703a 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-28 Enrica Casucci <enrica at 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 at igalia.com>
[GTK] AudioProcessingEvent.h and JSJavaScriptAudioNode.h: No such file or directory
diff --git a/Source/WebCore/platform/win/ClipboardWin.cpp b/Source/WebCore/platform/win/ClipboardWin.cpp
index 0624fb7..394610c 100644
--- a/Source/WebCore/platform/win/ClipboardWin.cpp
+++ b/Source/WebCore/platform/win/ClipboardWin.cpp
@@ -453,7 +453,7 @@ void ClipboardWin::clearAllData()
String ClipboardWin::getData(const String& type, bool& success) const
{
success = false;
- if (policy() != ClipboardReadable || !m_dataObject || m_dragDataMap.isEmpty())
+ if (policy() != ClipboardReadable || (!m_dataObject && m_dragDataMap.isEmpty()))
return "";
ClipboardDataType dataType = clipboardTypeFromMIMEType(type);
@@ -521,7 +521,7 @@ HashSet<String> ClipboardWin::types() const
if (policy() != ClipboardReadable && policy() != ClipboardTypesReadable)
return results;
- if (!m_dataObject || m_dragDataMap.isEmpty())
+ if (!m_dataObject && m_dragDataMap.isEmpty())
return results;
if (m_dataObject) {
@@ -559,7 +559,7 @@ PassRefPtr<FileList> ClipboardWin::files() const
if (policy() != ClipboardReadable && policy() != ClipboardTypesReadable)
return files.release();
- if (!m_dataObject || m_dragDataMap.isEmpty())
+ if (!m_dataObject && m_dragDataMap.isEmpty())
return files.release();
if (m_dataObject) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list