webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 11 insertions, 9 deletions

diff --git a/Source/WebCore/platform/FileChooser.cpp b/Source/WebCore/platform/FileChooser.cpp
index 4a10f16d3..eada49ba6 100644
--- a/Source/WebCore/platform/FileChooser.cpp
+++ b/Source/WebCore/platform/FileChooser.cpp
@@ -10,7 +10,7 @@
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution. 
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission. 
  *
@@ -37,9 +37,9 @@ FileChooser::FileChooser(FileChooserClient* client, const FileChooserSettings& s
 {
 }
 
-PassRefPtr<FileChooser> FileChooser::create(FileChooserClient* client, const FileChooserSettings& settings)
+Ref<FileChooser> FileChooser::create(FileChooserClient* client, const FileChooserSettings& settings)
 {
-    return adoptRef(new FileChooser(client, settings));
+    return adoptRef(*new FileChooser(client, settings));
 }
 
 FileChooser::~FileChooser()
@@ -70,12 +70,13 @@ void FileChooser::chooseFiles(const Vector<String>& filenames)
         return;
 
     Vector<FileChooserFileInfo> files;
-    for (unsigned i = 0; i < filenames.size(); ++i)
-        files.append(FileChooserFileInfo(filenames[i]));
+    for (auto& filename : filenames)
+        files.append(FileChooserFileInfo(filename));
     m_client->filesChosen(files);
 }
 
 #if PLATFORM(IOS)
+
 // FIXME: This function is almost identical to FileChooser::chooseFiles(). We should merge this function
 // with FileChooser::chooseFiles() and hence remove the PLATFORM(IOS)-guard.
 void FileChooser::chooseMediaFiles(const Vector<String>& filenames, const String& displayString, Icon* icon)
@@ -88,19 +89,20 @@ void FileChooser::chooseMediaFiles(const Vector<String>& filenames, const String
         return;
 
     Vector<FileChooserFileInfo> files;
-    for (auto filename : filenames)
+    for (auto& filename : filenames)
         files.append(FileChooserFileInfo(filename));
     m_client->filesChosen(files, displayString, icon);
 }
+
 #endif
 
 void FileChooser::chooseFiles(const Vector<FileChooserFileInfo>& files)
 {
-    // FIXME: This is inelegant. We should not be looking at settings here.
     Vector<String> paths;
-    for (unsigned i = 0; i < files.size(); ++i)
-        paths.append(files[i].path);
+    for (auto& file : files)
+        paths.append(file.path);
 
+    // FIXME: This is inelegant. We should not be looking at settings here.
     if (m_settings.selectedFiles == paths)
         return;