Changeset 89777 in webkit

Timestamp:

Jun 26, 2011 6:47:50 PM (13 years ago)

Author:

Dimitri Glazkov

Message:

2011-06-26 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Adam Barth.

FileList::filenames should be FileList::paths, because it's more accurate.
​https://bugs.webkit.org/show_bug.cgi?id=63414

Refactoring, no change in behavior.

• fileapi/FileList.cpp: (WebCore::FileList::paths): Renamed from filenames.
• fileapi/FileList.h:
• html/FileInputType.cpp: (WebCore::FileInputType::handleDOMActivateEvent): Changed to use filenames, also fixed a reach-unto-thyself whoopsie. (WebCore::FileInputType::requestIcon): Ditto. (WebCore::FileInputType::filesChosen): Ditto.
• rendering/RenderFileUploadControl.cpp: (WebCore::RenderFileUploadControl::fileTextValue): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• fileapi/FileList.cpp (modified) (1 diff)
• fileapi/FileList.h (modified) (1 diff)
• html/FileInputType.cpp (modified) (3 diffs)
• rendering/RenderFileUploadControl.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-26  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        FileList::filenames should be FileList::paths, because it's more accurate.
+        https://bugs.webkit.org/show_bug.cgi?id=63414
+
+        Refactoring, no change in behavior.
+
+        * fileapi/FileList.cpp:
+        (WebCore::FileList::paths): Renamed from filenames.
+        * fileapi/FileList.h:
+        * html/FileInputType.cpp:
+        (WebCore::FileInputType::handleDOMActivateEvent): Changed to use filenames, also fixed a reach-unto-thyself whoopsie.
+        (WebCore::FileInputType::requestIcon): Ditto.
+        (WebCore::FileInputType::filesChosen): Ditto.
+        * rendering/RenderFileUploadControl.cpp:
+        (WebCore::RenderFileUploadControl::fileTextValue): Ditto.
+
 2011-06-26  Young Han Lee  <joybro@company100.net>
 

trunk/Source/WebCore/fileapi/FileList.cpp

@@ -42 +42 @@
 }
 
-Vector<String> FileList::filenames() const
+Vector<String> FileList::paths() const
 {
-    Vector<String> filenames;
+    Vector<String> paths;
     for (unsigned i = 0; i < m_files.size(); ++i)
-        filenames.append(m_files[i]->path());
+        paths.append(m_files[i]->path());
 
-    return filenames;
+    return paths;
 }
 

trunk/Source/WebCore/fileapi/FileList.h

@@ -48 +48 @@
         void clear() { m_files.clear(); }
         void append(PassRefPtr<File> file) { m_files.append(file); }
-        Vector<String> filenames() const;
+        Vector<String> paths() const;
 
     private:

trunk/Source/WebCore/html/FileInputType.cpp

@@ -148 +148 @@
 #endif
         settings.acceptTypes = input->accept();
-        ASSERT(input->files());
-        settings.selectedFiles = input->files()->filenames();
+        settings.selectedFiles = m_fileList->paths();
         chrome->runOpenPanel(input->document()->frame(), newFileChooser(settings));
     }
@@ -253 +252 @@
 }
 
-void FileInputType::requestIcon(const Vector<String>& filenames)
-{
-    if (!filenames.size())
+void FileInputType::requestIcon(const Vector<String>& paths)
+{
+    if (!paths.size())
         return;
 
     if (Chrome* chrome = this->chrome())
-        chrome->loadIconForFiles(filenames, newFileIconLoader());
-}
-
-void FileInputType::filesChosen(const Vector<String>& filenames)
+        chrome->loadIconForFiles(paths, newFileIconLoader());
+}
+
+void FileInputType::filesChosen(const Vector<String>& paths)
 {
     HTMLInputElement* input = element();
-    setFileList(filenames);
+    setFileList(paths);
 
     input->setFormControlValueMatchesRenderer(true);
@@ -271 +270 @@
     input->setNeedsValidityCheck();
 
-    requestIcon(filenames);
+    requestIcon(paths);
 
     if (input->renderer())

trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp

@@ -211 +211 @@
     HTMLInputElement* input = static_cast<HTMLInputElement*>(node());
     ASSERT(input->files());
-    return theme()->fileListNameForWidth(input->files()->filenames(), style()->font(), maxFilenameWidth());
+    return theme()->fileListNameForWidth(input->files()->paths(), style()->font(), maxFilenameWidth());
 }