Changeset 53269 in webkit

Timestamp:

Jan 14, 2010 9:38:56 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-14 Kent Tamura <​tkent@chromium.org>

Reviewed by Darin Fisher.

Introduce WebFileChooserParams to convey parameters for
WebViewClient::runFileChooser(), and add new parameters to it.
​https://bugs.webkit.org/show_bug.cgi?id=32473

The new parameters are

• selected file names
• "accept" attribute value

• WebKit.gyp: Add WebFileChooserParams.h
• public/WebFileChooserParams.h: Added.
• public/WebViewClient.h: (WebKit::WebViewClient::runFileChooser): Add runFileChooser() with WebFileChooserParams, and mark the old one deprecated.
• src/ChromeClientImpl.cpp: (WebKit::ChromeClientImpl::runOpenPanel): Call the new runFileChooser() first, then call the old runFileChooser() if the new one failed.

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• WebKit.gyp (modified) (1 diff)
• public/WebFileChooserParams.h (added)
• public/WebViewClient.h (modified) (2 diffs)
• src/ChromeClientImpl.cpp (modified) (1 diff)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-01-14  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Introduce WebFileChooserParams to convey parameters for
+        WebViewClient::runFileChooser(), and add new parameters to it.
+        https://bugs.webkit.org/show_bug.cgi?id=32473
+
+        The new parameters are
+         - selected file names
+         - "accept" attribute value
+
+        * WebKit.gyp: Add WebFileChooserParams.h
+        * public/WebFileChooserParams.h: Added.
+        * public/WebViewClient.h:
+        (WebKit::WebViewClient::runFileChooser):
+          Add runFileChooser() with WebFileChooserParams, and mark the old one deprecated.
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::runOpenPanel):
+          Call the new runFileChooser() first, then call the old
+          runFileChooser() if the new one failed.
+
 2010-01-13  Kenneth Russell  <kbr@google.com>
 

trunk/WebKit/chromium/WebKit.gyp

@@ -109 +109 @@
                 'public/WebElement.h',
                 'public/WebFileChooserCompletion.h',
+                'public/WebFileChooserParams.h',
                 'public/WebFindOptions.h',
                 'public/WebFrame.h',

trunk/WebKit/chromium/public/WebViewClient.h

@@ -35 +35 @@
 #include "WebEditingAction.h"
 #include "WebFileChooserCompletion.h"
+#include "WebFileChooserParams.h"
 #include "WebString.h"
 #include "WebTextAffinity.h"
@@ -161 +162 @@
     // Dialogs -------------------------------------------------------------
 
+    // Deprecated. Use another runFileChooser() below instead.
+    virtual bool runFileChooser(
+        bool multiSelect, const WebString& title,
+        const WebString& initialValue, WebFileChooserCompletion*) { return false; }
+
     // This method returns immediately after showing the dialog. When the
     // dialog is closed, it should call the WebFileChooserCompletion to
     // pass the results of the dialog. Returns false if
     // WebFileChooseCompletion will never be called.
-    virtual bool runFileChooser(
-        bool multiSelect, const WebString& title,
-        const WebString& initialValue, WebFileChooserCompletion*) { return false; }
+    virtual bool runFileChooser(const WebFileChooserParams&,
+                                WebFileChooserCompletion*) { return false; }
 
     // Displays a modal alert dialog containing the given message.  Returns

trunk/WebKit/chromium/src/ChromeClientImpl.cpp

@@ -561 +561 @@
         return;
 
-    bool multipleFiles = fileChooser->allowsMultipleFiles();
-
-    WebString suggestion;
-    if (fileChooser->filenames().size() > 0)
-        suggestion = fileChooser->filenames()[0];
-
+    WebFileChooserParams params;
+    params.multiSelect = fileChooser->allowsMultipleFiles();
+    params.acceptTypes = fileChooser->acceptTypes();
+    params.selectedFiles = fileChooser->filenames();
+    if (params.selectedFiles.size() > 0)
+        params.initialValue = params.selectedFiles[0];
     WebFileChooserCompletionImpl* chooserCompletion =
         new WebFileChooserCompletionImpl(fileChooser);
-    bool ok = client->runFileChooser(multipleFiles,
-                                     WebString(),
-                                     suggestion,
-                                     chooserCompletion);
-    if (!ok) {
-        // Choosing failed, so do callback with an empty list.
-        chooserCompletion->didChooseFile(WebVector<WebString>());
-    }
+
+    if (client->runFileChooser(params, chooserCompletion))
+        return;
+
+    // Choosing with new function failed, so fallback to old function.
+    if (client->runFileChooser(params.multiSelect,
+                               params.title,
+                               params.initialValue,
+                               chooserCompletion))
+        return;
+
+    // Choosing with the old function failed, so do callback with an empty list.
+    chooserCompletion->didChooseFile(WebVector<WebString>());
 }