diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-13 16:06:28 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-13 16:06:28 +0000 |
| commit | 0b3743cf27e3a62092fc59d91d4013b0948071e6 (patch) | |
| tree | 0f59843f4efa478dfa781740f7770e1ded7e968c /content/worker | |
| parent | b5217d53382cebaa3a963c26ac8813675162e8da (diff) | |
| download | chromium_src-0b3743cf27e3a62092fc59d91d4013b0948071e6.zip chromium_src-0b3743cf27e3a62092fc59d91d4013b0948071e6.tar.gz chromium_src-0b3743cf27e3a62092fc59d91d4013b0948071e6.tar.bz2 | |
Use thread-local version of WebFileSystemImpl
NOTE: This must be landed before Blink's corresponding
patch (https://codereview.chromium.org/21767002/) but
the switch needs to happen only after Blink side's rolled,
so it has ugly ifdef's. I'll remove the ifdefs after
the switch is over.
BUG=257349
Review URL: https://chromiumcodereview.appspot.com/21997003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/worker')
| -rw-r--r-- | content/worker/worker_webkitplatformsupport_impl.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/content/worker/worker_webkitplatformsupport_impl.cc b/content/worker/worker_webkitplatformsupport_impl.cc index 144db959..a4de2c8 100644 --- a/content/worker/worker_webkitplatformsupport_impl.cc +++ b/content/worker/worker_webkitplatformsupport_impl.cc @@ -86,6 +86,10 @@ WorkerWebKitPlatformSupportImpl::WorkerWebKitPlatformSupportImpl( } WorkerWebKitPlatformSupportImpl::~WorkerWebKitPlatformSupportImpl() { +#ifdef USE_THREADLOCAL_WEBFILESYSTEM + // TODO(kinuko): Delete this ifdef after blink side switch's over. + WebFileSystemImpl::DeleteThreadSpecificInstance(); +#endif } WebClipboard* WorkerWebKitPlatformSupportImpl::clipboard() { @@ -98,9 +102,14 @@ WebMimeRegistry* WorkerWebKitPlatformSupportImpl::mimeRegistry() { } WebFileSystem* WorkerWebKitPlatformSupportImpl::fileSystem() { +#ifdef USE_THREADLOCAL_WEBFILESYSTEM + // TODO(kinuko): Delete this ifdef after blink side switch's over. + return WebFileSystemImpl::ThreadSpecificInstance(child_thread_loop_.get()); +#else if (!web_file_system_) web_file_system_.reset(new WebFileSystemImpl(child_thread_loop_.get())); return web_file_system_.get(); +#endif } WebFileUtilities* WorkerWebKitPlatformSupportImpl::fileUtilities() { |