diff options
author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/platform/FileChooser.cpp | |
parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/platform/FileChooser.cpp')
-rw-r--r-- | Source/WebCore/platform/FileChooser.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/WebCore/platform/FileChooser.cpp b/Source/WebCore/platform/FileChooser.cpp index 90dd567..7e6d4ae 100644 --- a/Source/WebCore/platform/FileChooser.cpp +++ b/Source/WebCore/platform/FileChooser.cpp @@ -42,13 +42,19 @@ inline FileChooser::FileChooser(FileChooserClient* client, const Vector<String>& , m_isInitializing(true) { m_filenames = initialFilenames; +} + +void FileChooser::initialize() +{ loadIcon(); m_isInitializing = false; } PassRefPtr<FileChooser> FileChooser::create(FileChooserClient* client, const Vector<String>& initialFilenames) { - return adoptRef(new FileChooser(client, initialFilenames)); + RefPtr<FileChooser> chooser(adoptRef(new FileChooser(client, initialFilenames))); + chooser->initialize(); + return chooser; } FileChooser::~FileChooser() |