diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 21:53:37 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 21:53:37 +0000 |
| commit | 59085ebc6e9fc0043548d58d7ae7d6b3764caeea (patch) | |
| tree | 7b817dd9ccf606234330cfd827e188b2ddaedf37 /webkit/fileapi | |
| parent | ca40603dd4cf19d94d27a1d38268310cde4d44e2 (diff) | |
| download | chromium_src-59085ebc6e9fc0043548d58d7ae7d6b3764caeea.zip chromium_src-59085ebc6e9fc0043548d58d7ae7d6b3764caeea.tar.gz chromium_src-59085ebc6e9fc0043548d58d7ae7d6b3764caeea.tar.bz2 | |
CrOS - Fix crash when closing file picker
Don't try to remove FileManagerDialog pointers from the pending list inside the FileMangerDialog destructor. This isn't needed, because dialogs are only "pending" when they are shown, and they are cleaned up in the Close* methods. Doing it results in std::map::erase() releasing a smart-pointer which calls erase() again and tries to release the object again. Memory management hilarity ensues. Also fix a compiler warning that only shows up when I use tcmalloc-related build options.
BUG=chromium-os:17728
TEST=manual, browser_tests FileManagerDialogTest.*
Review URL: http://codereview.chromium.org/7445004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93103 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi')
| -rw-r--r-- | webkit/fileapi/file_system_path_manager.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/webkit/fileapi/file_system_path_manager.cc b/webkit/fileapi/file_system_path_manager.cc index 2db5045..043d6499 100644 --- a/webkit/fileapi/file_system_path_manager.cc +++ b/webkit/fileapi/file_system_path_manager.cc @@ -88,7 +88,6 @@ FilePath FileSystemPathManager::ValidateFileSystemRootAndGetPathOnFileThread( case kFileSystemTypePersistent: return sandbox_provider_->ValidateFileSystemRootAndGetPathOnFileThread( origin_url, type, virtual_path, create); - break; case kFileSystemTypeExternal: return external_provider_.get() ? external_provider_->ValidateFileSystemRootAndGetPathOnFileThread( |