[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[dbates at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 9568504ff7e371606e70084a2fdebef2fb9b9d7c
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 12 05:46:22 2009 +0000

    2009-11-11  Daniel Bates  <dbates at webkit.org>
    
            Reviewed by Eric Seidel.
    
            https://bugs.webkit.org/show_bug.cgi?id=31326
    
            Makes the output for test fast/events/drag-and-drop.html pretty.
            Now, it is easier to read for a human to read understand the results.
    
            * fast/events/drag-and-drop-expected.txt: Rebased result.
            * fast/events/drag-and-drop.html: Modified to make the output pretty.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50866 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 75414f4..3c35801 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-11  Daniel Bates  <dbates at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31326
+
+        Makes the output for test fast/events/drag-and-drop.html pretty.
+        Now, it is easier to read for a human to read understand the results.
+
+        * fast/events/drag-and-drop-expected.txt: Rebased result.
+        * fast/events/drag-and-drop.html: Modified to make the output pretty.
+
 2009-11-11  Chris Fleizach  <cfleizach at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/LayoutTests/fast/events/drag-and-drop-expected.txt b/LayoutTests/fast/events/drag-and-drop-expected.txt
index 586ea0e..f600d3a 100644
--- a/LayoutTests/fast/events/drag-and-drop-expected.txt
+++ b/LayoutTests/fast/events/drag-and-drop-expected.txt
@@ -9,7 +9,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 When effectAllowed == "uninitialized"
 
-PASS event.dataTransfer.dropEffect is dropEffectElem.options[dropEffectElem.selectedIndex].value
+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.
@@ -17,7 +17,7 @@ PASS event.dataTransfer.dropEffect is "none"
 
 When effectAllowed == "none"
 
-PASS event.dataTransfer.dropEffect is dropEffectElem.options[dropEffectElem.selectedIndex].value
+PASS event.dataTransfer.dropEffect is "none"
 PASS event.dataTransfer.dropEffect is "none"
 PASS event.dataTransfer.dropEffect is "none"
 PASS event.dataTransfer.dropEffect is "none"
@@ -25,63 +25,63 @@ PASS event.dataTransfer.dropEffect is "none"
 
 When effectAllowed == "all"
 
-PASS event.dataTransfer.dropEffect is dropEffectElem.options[dropEffectElem.selectedIndex].value
-PASS event.dataTransfer.dropEffect is dropEffectElem.options[dropEffectElem.selectedIndex].value
-PASS event.dataTransfer.dropEffect is dropEffectElem.options[dropEffectElem.selectedIndex].value
-PASS event.dataTransfer.dropEffect is dropEffectElem.options[dropEffectElem.selectedIndex].value
+PASS event.dataTransfer.dropEffect is "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 == "copy"
 
-PASS event.dataTransfer.dropEffect is dropEffectElem.options[dropEffectElem.selectedIndex].value
-PASS event.dataTransfer.dropEffect is dropEffectElem.options[dropEffectElem.selectedIndex].value
+PASS event.dataTransfer.dropEffect is "none"
+PASS event.dataTransfer.dropEffect is "copy"
 PASS event.dataTransfer.dropEffect is "none"
 PASS event.dataTransfer.dropEffect is "none"
 PASS event.dataTransfer.dropEffect is "none"
 
 When effectAllowed == "move"
 
-PASS event.dataTransfer.dropEffect is dropEffectElem.options[dropEffectElem.selectedIndex].value
 PASS event.dataTransfer.dropEffect is "none"
-PASS event.dataTransfer.dropEffect is dropEffectElem.options[dropEffectElem.selectedIndex].value
+PASS event.dataTransfer.dropEffect is "none"
+PASS event.dataTransfer.dropEffect is "move"
 PASS event.dataTransfer.dropEffect is "none"
 PASS event.dataTransfer.dropEffect is "none"
 
 When effectAllowed == "link"
 
-PASS event.dataTransfer.dropEffect is dropEffectElem.options[dropEffectElem.selectedIndex].value
 PASS event.dataTransfer.dropEffect is "none"
 PASS event.dataTransfer.dropEffect is "none"
-PASS event.dataTransfer.dropEffect is dropEffectElem.options[dropEffectElem.selectedIndex].value
+PASS event.dataTransfer.dropEffect is "none"
+PASS event.dataTransfer.dropEffect is "link"
 PASS event.dataTransfer.dropEffect is "none"
 
 When effectAllowed == "copyMove"
 
-PASS event.dataTransfer.dropEffect is dropEffectElem.options[dropEffectElem.selectedIndex].value
-PASS event.dataTransfer.dropEffect is dropEffectElem.options[dropEffectElem.selectedIndex].value
-PASS event.dataTransfer.dropEffect is dropEffectElem.options[dropEffectElem.selectedIndex].value
+PASS event.dataTransfer.dropEffect is "none"
+PASS event.dataTransfer.dropEffect is "copy"
+PASS event.dataTransfer.dropEffect is "move"
 PASS event.dataTransfer.dropEffect is "none"
 PASS event.dataTransfer.dropEffect is "none"
 
 When effectAllowed == "copyLink"
 
-PASS event.dataTransfer.dropEffect is dropEffectElem.options[dropEffectElem.selectedIndex].value
-PASS event.dataTransfer.dropEffect is dropEffectElem.options[dropEffectElem.selectedIndex].value
 PASS event.dataTransfer.dropEffect is "none"
-PASS event.dataTransfer.dropEffect is dropEffectElem.options[dropEffectElem.selectedIndex].value
+PASS event.dataTransfer.dropEffect is "copy"
+PASS event.dataTransfer.dropEffect is "none"
+PASS event.dataTransfer.dropEffect is "link"
 PASS event.dataTransfer.dropEffect is "none"
 
 When effectAllowed == "linkMove"
 
-PASS event.dataTransfer.dropEffect is dropEffectElem.options[dropEffectElem.selectedIndex].value
 PASS event.dataTransfer.dropEffect is "none"
-PASS event.dataTransfer.dropEffect is dropEffectElem.options[dropEffectElem.selectedIndex].value
-PASS event.dataTransfer.dropEffect is dropEffectElem.options[dropEffectElem.selectedIndex].value
+PASS event.dataTransfer.dropEffect is "none"
+PASS event.dataTransfer.dropEffect is "move"
+PASS event.dataTransfer.dropEffect is "link"
 PASS event.dataTransfer.dropEffect is "none"
 
 When effectAllowed == "dummy"
 
-PASS event.dataTransfer.dropEffect is dropEffectElem.options[dropEffectElem.selectedIndex].value
+PASS event.dataTransfer.dropEffect is "none"
 PASS event.dataTransfer.dropEffect is "none"
 PASS event.dataTransfer.dropEffect is "none"
 PASS event.dataTransfer.dropEffect is "none"
diff --git a/LayoutTests/fast/events/drag-and-drop.html b/LayoutTests/fast/events/drag-and-drop.html
index 54d29bc..3e43427 100644
--- a/LayoutTests/fast/events/drag-and-drop.html
+++ b/LayoutTests/fast/events/drag-and-drop.html
@@ -89,7 +89,7 @@
         var actualDropEffect = e.dataTransfer.dropEffect;
         
         if (isDropEffectAllowed(chosenDropEffect, chosenEffectAllowed))
-            shouldEvaluateTo('event.dataTransfer.dropEffect', 'dropEffectElem.options[dropEffectElem.selectedIndex].value');
+            shouldBeEqualToString('event.dataTransfer.dropEffect', dropEffectElem.options[dropEffectElem.selectedIndex].value);
         else
             shouldBeEqualToString('event.dataTransfer.dropEffect', 'none');
             

-- 
WebKit Debian packaging