[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[jianli at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit d1f85702263e0f63c4fed4da44f1a095029c95c4
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 22 23:34:57 2010 +0000

    Tests that File.type returns empty string for file with invalid extension.
    https://bugs.webkit.org/show_bug.cgi?id=51501
    
    Reviewed by David Levin.
    
    * editing/pasteboard/file-input-files-access-expected.txt:
    * editing/pasteboard/resources/file.invalidext: Added.
    * editing/pasteboard/script-tests/file-input-files-access.js:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74510 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3f81452..2324413 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-22  Jian Li  <jianli at chromium.org>
+
+        Reviewed by David Levin.
+
+        Tests that File.type returns empty string for file with invalid extension.
+        https://bugs.webkit.org/show_bug.cgi?id=51501
+
+        * editing/pasteboard/file-input-files-access-expected.txt:
+        * editing/pasteboard/resources/file.invalidext: Added.
+        * editing/pasteboard/script-tests/file-input-files-access.js:
+
 2010-12-22  Steve Lacey  <sjl at chromium.org>
 
         Reviewed by David Levin.
diff --git a/LayoutTests/editing/pasteboard/file-input-files-access-expected.txt b/LayoutTests/editing/pasteboard/file-input-files-access-expected.txt
index 1e013a3..dc06311 100644
--- a/LayoutTests/editing/pasteboard/file-input-files-access-expected.txt
+++ b/LayoutTests/editing/pasteboard/file-input-files-access-expected.txt
@@ -33,9 +33,9 @@ FIXME:  elements should refuse drags including directories: https://bugs.webkit.
 Dragging a directory and a file onto a single-file input control:
 FAIL fileInput.value should be . Was C:\fakepath\directory-for-dragging.
 FAIL fileInput.files.length should be 0. Was 1.
-Dragging two files to a multi-file input control:
+Dragging three files to a multi-file input control:
 PASS fileInput.value is "C:\\fakepath\\apple.gif"
-PASS fileInput.files.length is 2
+PASS fileInput.files.length is 3
 PASS fileInput.files[0].name is "apple.gif"
 PASS fileInput.files[0].type is "image/gif"
 PASS fileInput.files[0].size is 1476
@@ -46,6 +46,11 @@ PASS fileInput.files[1].type is "image/gif"
 PASS fileInput.files[1].size is 2593
 PASS fileInput.files[1].fileName is "mozilla.gif"
 PASS fileInput.files[1].fileSize is 2593
+PASS fileInput.files[2].name is "file.invalidext"
+PASS fileInput.files[2].type is ""
+PASS fileInput.files[2].size is 10
+PASS fileInput.files[2].fileName is "file.invalidext"
+PASS fileInput.files[2].fileSize is 10
 Dragging a file and a directory onto a mutli-file input control:
 FAIL fileInput.value should be . Was C:\fakepath\apple.gif.
 FAIL fileInput.files.length should be 0. Was 2.
diff --git a/LayoutTests/http/tests/local/resources/file-for-drag-to-send.txt b/LayoutTests/editing/pasteboard/resources/file.invalidext
similarity index 100%
copy from LayoutTests/http/tests/local/resources/file-for-drag-to-send.txt
copy to LayoutTests/editing/pasteboard/resources/file.invalidext
diff --git a/LayoutTests/editing/pasteboard/script-tests/file-input-files-access.js b/LayoutTests/editing/pasteboard/script-tests/file-input-files-access.js
index 6fbe405..97aff60 100644
--- a/LayoutTests/editing/pasteboard/script-tests/file-input-files-access.js
+++ b/LayoutTests/editing/pasteboard/script-tests/file-input-files-access.js
@@ -99,10 +99,11 @@ function runTest()
 
     fileInput.multiple = true;
 
-    debug("Dragging two files to a multi-file input control:");
+    debug("Dragging three files to a multi-file input control:");
     testDraggingFiles([
         { 'path': 'resources/apple.gif', 'name' : 'apple.gif', 'size' : 1476, 'type' : 'image/gif' },
-        { 'path': 'resources/mozilla.gif', 'name' : 'mozilla.gif', 'size' : 2593, 'type' : 'image/gif' }
+        { 'path': 'resources/mozilla.gif', 'name' : 'mozilla.gif', 'size' : 2593, 'type' : 'image/gif' },
+        { 'path': 'resources/file.invalidext', 'name' : 'file.invalidext', 'size' : 10, 'type' : '' }
     ]);
 
     testOrderedDraggingWithDirectory();

-- 
WebKit Debian packaging