Changeset 61848 in webkit

Timestamp:

Jun 25, 2010 4:28:03 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-06-25 Lucas De Marchi <​lucas.demarchi@profusion.mobi>

Reviewed by Kenneth Rohde Christiansen.

[EFL] Implement runOpenPanel method. The interface with browser was
already implemented. Now we are actually calling it.
​https://bugs.webkit.org/show_bug.cgi?id=40923

• efl/WebCoreSupport/ChromeClientEfl.cpp: (WebCore::ChromeClientEfl::runOpenPanel): implement method.
• efl/ewk/ewk_private.h: export to WebCoreSupport the needed method

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• efl/WebCoreSupport/ChromeClientEfl.cpp (modified) (2 diffs)
• efl/ewk/ewk_private.h (modified) (1 diff)

trunk/WebKit/ChangeLog

@@ +1 @@
+2010-06-25  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [EFL] Implement runOpenPanel method. The interface with browser was
+        already implemented. Now we are actually calling it.
+        https://bugs.webkit.org/show_bug.cgi?id=40923
+
+        * efl/WebCoreSupport/ChromeClientEfl.cpp:
+        (WebCore::ChromeClientEfl::runOpenPanel): implement method.
+        * efl/ewk/ewk_private.h: export to WebCoreSupport the needed method
+
 2010-06-24  Jer Noble  <jer.noble@apple.com>
 

trunk/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp

@@ -39 +39 @@
 #endif
 #include "EWebKit.h"
+#include "FileChooser.h"
 #include "FloatRect.h"
 #include "FrameLoader.h"
@@ -385 +386 @@
 void ChromeClientEfl::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> prpFileChooser)
 {
-    notImplemented();
+    RefPtr<FileChooser> chooser = prpFileChooser;
+    bool confirm;
+    Eina_List* selectedFilenames = 0;
+    Eina_List* suggestedFilenames = 0;
+    void* filename;
+    Vector<String> filenames;
+
+    for (unsigned i = 0; i < chooser->filenames().size(); i++) {
+        CString str = chooser->filenames()[i].utf8();
+        filename = strdup(str.data());
+        suggestedFilenames = eina_list_append(suggestedFilenames, filename);
+    }
+
+    confirm = ewk_view_run_open_panel(m_view, kit(frame), chooser->allowsMultipleFiles(), suggestedFilenames, &selectedFilenames);
+    EINA_LIST_FREE(suggestedFilenames, filename)
+        free(filename);
+
+    if (!confirm)
+        return;
+
+    EINA_LIST_FREE(selectedFilenames, filename) {
+        filenames.append((char *)filename);
+        free(filename);
+    }
+
+    if (chooser->allowsMultipleFiles())
+        chooser->chooseFiles(filenames);
+    else
+        chooser->chooseFile(filenames[0]);
 }
 

trunk/WebKit/efl/ewk/ewk_private.h

@@ -85 +85 @@
 uint64_t         ewk_view_exceeded_database_quota(Evas_Object *o, Evas_Object *frame, const char *databaseName, uint64_t current_size, uint64_t expected_size);
 
+Eina_Bool        ewk_view_run_open_panel(Evas_Object *o, Evas_Object *frame, Eina_Bool allows_multiple_files, const Eina_List *suggested_filenames, Eina_List **selected_filenames);
+
 void             ewk_view_repaint(Evas_Object *o, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
 void             ewk_view_scroll(Evas_Object *o, Evas_Coord dx, Evas_Coord dy, Evas_Coord sx, Evas_Coord sy, Evas_Coord sw, Evas_Coord sh, Evas_Coord cx, Evas_Coord cy, Evas_Coord cw, Evas_Coord ch, Eina_Bool main_frame);