[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
dbates at webkit.org
dbates at webkit.org
Wed Apr 7 23:34:26 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 35be7cff9b4d30f8db5de84bdd2b2a7feecec1be
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 12 19:21:52 2009 +0000
2009-11-12 Daniel Bates <dbates at webkit.org>
Reviewed by Darin Adler.
https://bugs.webkit.org/show_bug.cgi?id=30291
Fixes an issue where the returned drop effect is incorrect when
effectAllowed == "uninitialized".
According to section 7.9.2 of the HTML 5 spec.
<http://dev.w3.org/html5/spec/Overview.html#the-dragevent-and-datatransfer-interfaces>
when effectAllowed = "uninitialized" the resulting dropEffect should be the
user-specified dropEffect (i.e. "copy", "move", "link") and "none" for any
other case.
No test cases are included because we have an existing test case from
bug #24731.
* dom/Clipboard.cpp:
(WebCore::dragOpFromIEOp): Added case for op == "uninitialized".
2009-11-12 Daniel Bates <dbates at webkit.org>
Reviewed by Darin Adler.
https://bugs.webkit.org/show_bug.cgi?id=30291
Rebased results for existing test case fast/events/drag-and-drop.html
from bug #24731.
Now, we can run the part of the test when effectAllowed == "uninitialized".
* fast/events/drag-and-drop-expected.txt: Rebased results.
* fast/events/drag-and-drop.html: Removed notice about this bug (#30291).
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50888 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 06a202c..fc72da5 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2009-11-12 Daniel Bates <dbates at webkit.org>
+
+ Reviewed by Darin Adler.
+
+ https://bugs.webkit.org/show_bug.cgi?id=30291
+
+ Rebased results for existing test case fast/events/drag-and-drop.html
+ from bug #24731.
+
+ Now, we can run the part of the test when effectAllowed == "uninitialized".
+
+ * fast/events/drag-and-drop-expected.txt: Rebased results.
+ * fast/events/drag-and-drop.html: Removed notice about this bug (#30291).
+
2009-11-12 Chris Fleizach <cfleizach at apple.com>
Reviewed by Darin Adler.
diff --git a/LayoutTests/fast/events/drag-and-drop-expected.txt b/LayoutTests/fast/events/drag-and-drop-expected.txt
index f600d3a..6453365 100644
--- a/LayoutTests/fast/events/drag-and-drop-expected.txt
+++ b/LayoutTests/fast/events/drag-and-drop-expected.txt
@@ -1,8 +1,6 @@
This test checks that drag-and-drop support works and conforms to the HTML 5 specification.
For each effectAllowed, iterates through the possible dropEffects: none, copy, move, link, dummy.
-Note, this test fails when effectAllowed == "uninitialized" because this effect has not been implemented yet (see bug #30291).
-
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
@@ -10,9 +8,9 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
When effectAllowed == "uninitialized"
PASS event.dataTransfer.dropEffect is "none"
-FAIL event.dataTransfer.dropEffect should be copy. Was none.
-FAIL event.dataTransfer.dropEffect should be move. Was none.
-FAIL event.dataTransfer.dropEffect should be link. Was none.
+PASS event.dataTransfer.dropEffect is "copy"
+PASS event.dataTransfer.dropEffect is "move"
+PASS event.dataTransfer.dropEffect is "link"
PASS event.dataTransfer.dropEffect is "none"
When effectAllowed == "none"
diff --git a/LayoutTests/fast/events/drag-and-drop.html b/LayoutTests/fast/events/drag-and-drop.html
index 3e43427..14fed6d 100644
--- a/LayoutTests/fast/events/drag-and-drop.html
+++ b/LayoutTests/fast/events/drag-and-drop.html
@@ -176,9 +176,7 @@
<div id="console"></div>
<script>
description("This test checks that drag-and-drop support works and conforms to the HTML 5 specification.<br/>" +
- "For each effectAllowed, iterates through the possible dropEffects: none, copy, move, link, dummy.<br/><br/>" +
- "Note, this test fails when effectAllowed == "uninitialized" because this effect has not been " +
- "implemented yet (see bug #30291).");
+ "For each effectAllowed, iterates through the possible dropEffects: none, copy, move, link, dummy.");
var successfullyParsed = true;
</script>
</body>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 469b144..a69cefd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,24 @@
+2009-11-12 Daniel Bates <dbates at webkit.org>
+
+ Reviewed by Darin Adler.
+
+ https://bugs.webkit.org/show_bug.cgi?id=30291
+
+ Fixes an issue where the returned drop effect is incorrect when
+ effectAllowed == "uninitialized".
+
+ According to section 7.9.2 of the HTML 5 spec.
+ <http://dev.w3.org/html5/spec/Overview.html#the-dragevent-and-datatransfer-interfaces>
+ when effectAllowed = "uninitialized" the resulting dropEffect should be the
+ user-specified dropEffect (i.e. "copy", "move", "link") and "none" for any
+ other case.
+
+ No test cases are included because we have an existing test case from
+ bug #24731.
+
+ * dom/Clipboard.cpp:
+ (WebCore::dragOpFromIEOp): Added case for op == "uninitialized".
+
2009-11-12 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
diff --git a/WebCore/dom/Clipboard.cpp b/WebCore/dom/Clipboard.cpp
index 6d1bc15..2aea90a 100644
--- a/WebCore/dom/Clipboard.cpp
+++ b/WebCore/dom/Clipboard.cpp
@@ -55,6 +55,8 @@ void Clipboard::setAccessPolicy(ClipboardAccessPolicy policy)
static DragOperation dragOpFromIEOp(const String& op)
{
// yep, it's really just this fixed set
+ if (op == "uninitialized")
+ return DragOperationEvery;
if (op == "none")
return DragOperationNone;
if (op == "copy")
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list