[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 8412abd77ada15a8c7dc9b024e8f2b1b0a951e43
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 4 23:59:15 2009 +0000

    2009-11-04  Daniel Bates  <dbates at webkit.org>
    
            Reviewed by Eric Seidel.
    
            https://bugs.webkit.org/show_bug.cgi?id=30266
    
            Changed data format type from "text" to "text/plain" to pass Chrome tests.
    
            * fast/events/drag-and-drop-dataTransfer-types-nocrash-expected.txt:
            * fast/events/drag-and-drop-dataTransfer-types-nocrash.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50532 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2f8a102..915264d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-04  Daniel Bates  <dbates at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30266
+        
+        Changed data format type from "text" to "text/plain" to pass Chrome tests.
+
+        * fast/events/drag-and-drop-dataTransfer-types-nocrash-expected.txt:
+        * fast/events/drag-and-drop-dataTransfer-types-nocrash.html:
+
 2009-11-04  Chris Fleizach  <cfleizach at apple.com>
 
         Reviewed by Beth Dakin.
diff --git a/LayoutTests/fast/events/drag-and-drop-dataTransfer-types-nocrash-expected.txt b/LayoutTests/fast/events/drag-and-drop-dataTransfer-types-nocrash-expected.txt
index 6b5a134..afe730a 100644
--- a/LayoutTests/fast/events/drag-and-drop-dataTransfer-types-nocrash-expected.txt
+++ b/LayoutTests/fast/events/drag-and-drop-dataTransfer-types-nocrash-expected.txt
@@ -3,7 +3,7 @@ This test checks that on a successful drop we can access event.dataTransfer.type
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS event.dataTransfer.types[0] is "text"
+PASS event.dataTransfer.types contains format "text/plain"
 
 TEST COMPLETE
 
diff --git a/LayoutTests/fast/events/drag-and-drop-dataTransfer-types-nocrash.html b/LayoutTests/fast/events/drag-and-drop-dataTransfer-types-nocrash.html
index 034b829..a37b0e6 100644
--- a/LayoutTests/fast/events/drag-and-drop-dataTransfer-types-nocrash.html
+++ b/LayoutTests/fast/events/drag-and-drop-dataTransfer-types-nocrash.html
@@ -13,7 +13,7 @@
     var consoleElm;
     var event;
     
-    var FORMAT_TYPE = 'text';
+    var FORMAT_TYPE = 'text/plain';
     var ALLOWED_EFFECT = 'copy';
     var DROP_EFFECT = 'copy';
     
@@ -85,7 +85,10 @@
     {
         event = e;
         var formatTypes = e.dataTransfer.types; // This line causes the crash.
-        shouldBeEqualToString('event.dataTransfer.types[0]', FORMAT_TYPE);
+        if (event.dataTransfer.types.indexOf(FORMAT_TYPE) == -1)
+            testFailed('event.dataTransfer.types should contain format "' + FORMAT_TYPE + '", but it does not.');
+        else
+            testPassed('event.dataTransfer.types contains format "' + FORMAT_TYPE + '"');
     }
 
     function runTest()

-- 
WebKit Debian packaging