diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-16 00:01:25 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-16 00:01:25 +0000 |
| commit | 235478be87f59f3962eda9d8f3fba04e8a5096e4 (patch) | |
| tree | e09c7073a596ac7fe96ef3480b278254e2b20f53 | |
| parent | a312a4472002e8147e65a57111b51eff683dcc3e (diff) | |
| download | chromium_src-235478be87f59f3962eda9d8f3fba04e8a5096e4.zip chromium_src-235478be87f59f3962eda9d8f3fba04e8a5096e4.tar.gz chromium_src-235478be87f59f3962eda9d8f3fba04e8a5096e4.tar.bz2 | |
Temporarily whitelist DirectoryLister, which is blocking the IO thread.
BUG=65331
TEST=none
Review URL: http://codereview.chromium.org/5910002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69350 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/base/directory_lister.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/base/directory_lister.cc b/net/base/directory_lister.cc index 0a22d2b..9c03cf7 100644 --- a/net/base/directory_lister.cc +++ b/net/base/directory_lister.cc @@ -11,6 +11,7 @@ #include "base/i18n/file_util_icu.h" #include "base/message_loop.h" #include "base/platform_thread.h" +#include "base/thread_restrictions.h" #include "net/base/net_errors.h" namespace net { @@ -122,6 +123,9 @@ DirectoryLister::DirectoryLister(const FilePath& dir, DirectoryLister::~DirectoryLister() { if (thread_) { + // This is a bug and we should stop joining this thread. + // http://crbug.com/65331 + base::ThreadRestrictions::ScopedAllowIO allow_io; PlatformThread::Join(thread_); } } |