[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[johnnyg at google.com]

The following commit has been merged in the debian/experimental branch:
commit 8c868c0d87102212cde93bec4f5e5c2962b27599
Author: johnnyg at google.com <johnnyg at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jul 17 17:04:09 2010 +0000

    2010-07-17  John Gregg  <johnnyg at google.com>
    
            Reviewed by Kent Tamura.
    
            [chromium] directory upload: pass the attribute up to the chrome client
            https://bugs.webkit.org/show_bug.cgi?id=42475
    
            This allows chromium to display the native system directory picker when
            the directory attribute is present on the input element.
    
            * public/WebFileChooserParams.h:
            * src/ChromeClientImpl.cpp:
            (WebKit::ChromeClientImpl::runOpenPanel):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63609 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 8c2a117..4b89209 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-17  John Gregg  <johnnyg at google.com>
+
+        Reviewed by Kent Tamura.
+
+        [chromium] directory upload: pass the attribute up to the chrome client        
+        https://bugs.webkit.org/show_bug.cgi?id=42475
+
+        This allows chromium to display the native system directory picker when
+        the directory attribute is present on the input element.
+
+        * public/WebFileChooserParams.h:
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::runOpenPanel):
+
 2010-07-16  Zhe Su  <suzhe at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/chromium/public/WebFileChooserParams.h b/WebKit/chromium/public/WebFileChooserParams.h
index 6359f14..2a30944 100644
--- a/WebKit/chromium/public/WebFileChooserParams.h
+++ b/WebKit/chromium/public/WebFileChooserParams.h
@@ -40,6 +40,8 @@ namespace WebKit {
 struct WebFileChooserParams {
     // If |multiSelect| is true, the dialog allow to select multiple files.
     bool multiSelect;
+    // If |directory| is true, the dialog allows the user to select a directory.
+    bool directory;
     // |title| is a title of a file chooser dialog. It can be an empty string.
     WebString title;
     // |initialValue| is a filename which the dialog should select by default.
diff --git a/WebKit/chromium/src/ChromeClientImpl.cpp b/WebKit/chromium/src/ChromeClientImpl.cpp
index a4dc10b..d43d88a 100644
--- a/WebKit/chromium/src/ChromeClientImpl.cpp
+++ b/WebKit/chromium/src/ChromeClientImpl.cpp
@@ -589,6 +589,11 @@ void ChromeClientImpl::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> fileCh
 
     WebFileChooserParams params;
     params.multiSelect = fileChooser->allowsMultipleFiles();
+#if ENABLE(DIRECTORY_UPLOAD)
+    params.directory = fileChooser->allowsDirectoryUpload();
+#else
+    params.directory = false;
+#endif
     params.acceptTypes = fileChooser->acceptTypes();
     params.selectedFiles = fileChooser->filenames();
     if (params.selectedFiles.size() > 0)

-- 
WebKit Debian packaging