diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
| commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
| tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebCore/platform/FileChooser.cpp | |
| parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
| download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 | |
Merge in WebKit r47029.
Diffstat (limited to 'WebCore/platform/FileChooser.cpp')
| -rw-r--r-- | WebCore/platform/FileChooser.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/platform/FileChooser.cpp b/WebCore/platform/FileChooser.cpp index 1aeefb9..739181d 100644 --- a/WebCore/platform/FileChooser.cpp +++ b/WebCore/platform/FileChooser.cpp @@ -72,6 +72,8 @@ void FileChooser::chooseFile(const String& filename) void FileChooser::chooseFiles(const Vector<String>& filenames) { + if (m_filenames == filenames) + return; m_filenames = filenames; m_icon = chooseIcon(filenames); if (m_client) @@ -85,6 +87,8 @@ PassRefPtr<Icon> FileChooser::chooseIcon(const String& filename) PassRefPtr<Icon> FileChooser::chooseIcon(Vector<String> filenames) { + if (filenames.isEmpty()) + return 0; if (filenames.size() == 1) return Icon::createIconForFile(filenames[0]); return Icon::createIconForFiles(filenames); |