summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/fileapi/file_system_operation_context.h20
-rw-r--r--webkit/fileapi/file_system_task_runners.cc2
-rw-r--r--webkit/fileapi/file_system_task_runners.h2
-rw-r--r--webkit/fileapi/isolated_mount_point_provider.cc20
-rw-r--r--webkit/fileapi/media/device_media_file_util.cc41
-rw-r--r--webkit/fileapi/media/mtp_device_delegate.h13
-rw-r--r--webkit/fileapi/media/mtp_device_map_service.cc20
-rw-r--r--webkit/fileapi/media/mtp_device_map_service.h23
8 files changed, 68 insertions, 73 deletions
diff --git a/webkit/fileapi/file_system_operation_context.h b/webkit/fileapi/file_system_operation_context.h
index 9c9c59a..0c79629 100644
--- a/webkit/fileapi/file_system_operation_context.h
+++ b/webkit/fileapi/file_system_operation_context.h
@@ -39,16 +39,14 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE FileSystemOperationContext {
int64 allowed_bytes_growth() const { return allowed_bytes_growth_; }
#if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
- // Called on IO thread.
- void set_mtp_device_delegate(
- const base::WeakPtr<MTPDeviceDelegate>& delegate) {
- mtp_device_delegate_ = delegate;
+ // Initializes |mtp_device_delegate_url_| on the IO thread.
+ void set_mtp_device_delegate_url(const std::string& delegate_url) {
+ mtp_device_delegate_url_ = delegate_url;
}
- // Caller of this function should dereference the delegate only on media
- // sequenced task runner thread.
- base::WeakPtr<MTPDeviceDelegate> mtp_device_delegate() const {
- return mtp_device_delegate_;
+ // Reads |mtp_device_delegate_url_| on |task_runner_|.
+ const std::string& mtp_device_delegate_url() const {
+ return mtp_device_delegate_url_;
}
#endif
@@ -96,9 +94,9 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE FileSystemOperationContext {
UpdateObserverList update_observers_;
#if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
- // The media transfer protocol (MTP) device delegate.
- // Set on IO thread and dereferenced on media sequenced task runner thread.
- base::WeakPtr<MTPDeviceDelegate> mtp_device_delegate_;
+ // URL for the media transfer protocol (MTP) device delegate.
+ // Initialized on IO thread and used on |task_runner_|.
+ std::string mtp_device_delegate_url_;
#endif
};
diff --git a/webkit/fileapi/file_system_task_runners.cc b/webkit/fileapi/file_system_task_runners.cc
index fbd2606..c24562a 100644
--- a/webkit/fileapi/file_system_task_runners.cc
+++ b/webkit/fileapi/file_system_task_runners.cc
@@ -10,6 +10,8 @@
namespace fileapi {
+const char kMediaTaskRunnerName[] = "media-task-runner";
+
FileSystemTaskRunners::FileSystemTaskRunners(
base::SingleThreadTaskRunner* io_task_runner,
base::SingleThreadTaskRunner* file_task_runner,
diff --git a/webkit/fileapi/file_system_task_runners.h b/webkit/fileapi/file_system_task_runners.h
index a2fc4f1..aabb9ab 100644
--- a/webkit/fileapi/file_system_task_runners.h
+++ b/webkit/fileapi/file_system_task_runners.h
@@ -16,6 +16,8 @@ class SingleThreadTaskRunner;
namespace fileapi {
+WEBKIT_STORAGE_EXPORT extern const char kMediaTaskRunnerName[];
+
// This class holds task runners used for filesystem related stuff.
class WEBKIT_STORAGE_EXPORT FileSystemTaskRunners {
public:
diff --git a/webkit/fileapi/isolated_mount_point_provider.cc b/webkit/fileapi/isolated_mount_point_provider.cc
index 62135a8..e94d3a5 100644
--- a/webkit/fileapi/isolated_mount_point_provider.cc
+++ b/webkit/fileapi/isolated_mount_point_provider.cc
@@ -29,7 +29,6 @@
#if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
#include "webkit/fileapi/media/device_media_file_util.h"
-#include "webkit/fileapi/media/mtp_device_map_service.h"
#endif
namespace fileapi {
@@ -115,27 +114,16 @@ FileSystemOperation* IsolatedMountPointProvider::CreateFileSystemOperation(
base::PlatformFileError* error_code) const {
scoped_ptr<FileSystemOperationContext> operation_context(
new FileSystemOperationContext(context));
- if (url.type() == kFileSystemTypeNativeMedia) {
+ if (url.type() == kFileSystemTypeNativeMedia ||
+ url.type() == kFileSystemTypeDeviceMedia) {
operation_context->set_media_path_filter(media_path_filter_.get());
operation_context->set_task_runner(
context->task_runners()->media_task_runner());
}
#if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
- if (url.type() == kFileSystemTypeDeviceMedia) {
- MTPDeviceMapService* map_service = MTPDeviceMapService::GetInstance();
- MTPDeviceDelegate* device_delegate =
- map_service->GetMTPDeviceDelegate(url.filesystem_id());
- if (!device_delegate) {
- if (error_code)
- *error_code = base::PLATFORM_FILE_ERROR_NOT_FOUND;
- return NULL;
- }
- operation_context->set_mtp_device_delegate(
- device_delegate->GetAsWeakPtrOnIOThread());
- operation_context->set_task_runner(device_delegate->GetMediaTaskRunner());
- operation_context->set_media_path_filter(media_path_filter_.get());
- }
+ if (url.type() == kFileSystemTypeDeviceMedia)
+ operation_context->set_mtp_device_delegate_url(url.filesystem_id());
#endif
return new LocalFileSystemOperation(context, operation_context.Pass());
diff --git a/webkit/fileapi/media/device_media_file_util.cc b/webkit/fileapi/media/device_media_file_util.cc
index bf7cd40..5edc76b 100644
--- a/webkit/fileapi/media/device_media_file_util.cc
+++ b/webkit/fileapi/media/device_media_file_util.cc
@@ -23,6 +23,12 @@ namespace {
const FilePath::CharType kDeviceMediaFileUtilTempDir[] =
FILE_PATH_LITERAL("DeviceMediaFileSystem");
+MTPDeviceDelegate* GetMTPDeviceDelegate(FileSystemOperationContext* context) {
+ DCHECK(context->task_runner()->RunsTasksOnCurrentThread());
+ return MTPDeviceMapService::GetInstance()->GetMTPDeviceDelegate(
+ context->mtp_device_delegate_url());
+}
+
} // namespace
DeviceMediaFileUtil::DeviceMediaFileUtil(const FilePath& profile_path)
@@ -63,11 +69,11 @@ PlatformFileError DeviceMediaFileUtil::GetFileInfo(
const FileSystemURL& url,
PlatformFileInfo* file_info,
FilePath* platform_path) {
- if (!context->mtp_device_delegate().get())
+ MTPDeviceDelegate* delegate = GetMTPDeviceDelegate(context);
+ if (!delegate)
return base::PLATFORM_FILE_ERROR_NOT_FOUND;
- PlatformFileError error =
- context->mtp_device_delegate()->GetFileInfo(url.path(), file_info);
+ PlatformFileError error = delegate->GetFileInfo(url.path(), file_info);
if (error != base::PLATFORM_FILE_OK)
return error;
@@ -78,19 +84,19 @@ PlatformFileError DeviceMediaFileUtil::GetFileInfo(
}
scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator>
- DeviceMediaFileUtil::CreateFileEnumerator(
- FileSystemOperationContext* context,
- const FileSystemURL& url,
- bool recursive) {
- if (!context->mtp_device_delegate().get()) {
+DeviceMediaFileUtil::CreateFileEnumerator(
+ FileSystemOperationContext* context,
+ const FileSystemURL& url,
+ bool recursive) {
+ MTPDeviceDelegate* delegate = GetMTPDeviceDelegate(context);
+ if (!delegate) {
return scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator>(
new FileSystemFileUtil::EmptyFileEnumerator());
}
- return make_scoped_ptr(new FilteringFileEnumerator(
- context->mtp_device_delegate()->CreateFileEnumerator(url.path(),
- recursive),
- context->media_path_filter()))
- .PassAs<FileSystemFileUtil::AbstractFileEnumerator>();
+ return scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator>(
+ new FilteringFileEnumerator(
+ delegate->CreateFileEnumerator(url.path(), recursive),
+ context->media_path_filter()));
}
PlatformFileError DeviceMediaFileUtil::GetLocalFilePath(
@@ -118,7 +124,8 @@ PlatformFileError DeviceMediaFileUtil::Truncate(
bool DeviceMediaFileUtil::IsDirectoryEmpty(
FileSystemOperationContext* context,
const FileSystemURL& url) {
- if (!context->mtp_device_delegate().get())
+ MTPDeviceDelegate* delegate = GetMTPDeviceDelegate(context);
+ if (!delegate)
return false;
scoped_ptr<AbstractFileEnumerator> enumerator(
@@ -168,7 +175,8 @@ base::PlatformFileError DeviceMediaFileUtil::CreateSnapshotFile(
DCHECK(file_info);
DCHECK(local_path);
DCHECK(snapshot_policy);
- if (!context->mtp_device_delegate().get())
+ MTPDeviceDelegate* delegate = GetMTPDeviceDelegate(context);
+ if (!delegate)
return base::PLATFORM_FILE_ERROR_NOT_FOUND;
// We return a temporary file as a snapshot.
@@ -193,8 +201,7 @@ base::PlatformFileError DeviceMediaFileUtil::CreateSnapshotFile(
<< isolated_media_file_system_dir_path.value();
return base::PLATFORM_FILE_ERROR_FAILED;
}
- return context->mtp_device_delegate()->CreateSnapshotFile(
- url.path(), *local_path, file_info);
+ return delegate->CreateSnapshotFile(url.path(), *local_path, file_info);
}
} // namespace fileapi
diff --git a/webkit/fileapi/media/mtp_device_delegate.h b/webkit/fileapi/media/mtp_device_delegate.h
index a9bc764..5be4e56 100644
--- a/webkit/fileapi/media/mtp_device_delegate.h
+++ b/webkit/fileapi/media/mtp_device_delegate.h
@@ -5,15 +5,13 @@
#ifndef WEBKIT_FILEAPI_MEDIA_MTP_DEVICE_DELEGATE_H_
#define WEBKIT_FILEAPI_MEDIA_MTP_DEVICE_DELEGATE_H_
-#include "base/file_path.h"
#include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
#include "base/platform_file.h"
-#include "base/sequenced_task_runner_helpers.h"
#include "webkit/fileapi/file_system_file_util.h"
+class FilePath;
+
namespace base {
-struct PlatformFileInfo;
class SequencedTaskRunner;
class Time;
}
@@ -24,7 +22,7 @@ namespace fileapi {
// isolated file system operations. Class that implements this delegate does
// the actual communication with the MTP device. ScopedMTPDeviceMapEntry class
// manages the lifetime of the delegate via MTPDeviceMapService class.
-class MTPDeviceDelegate : public base::SupportsWeakPtr<MTPDeviceDelegate> {
+class MTPDeviceDelegate {
public:
// Returns information about the given file path.
virtual base::PlatformFileError GetFileInfo(
@@ -59,12 +57,9 @@ class MTPDeviceDelegate : public base::SupportsWeakPtr<MTPDeviceDelegate> {
// implementation class by this call. This function should take care of
// deleting itself on the right thread. This function should cancel all the
// pending requests before posting any message to delete itself.
- // Called on the IO thread.
+ // Called on the UI thread.
virtual void CancelPendingTasksAndDeleteDelegate() = 0;
- // Called on the IO thread.
- virtual base::WeakPtr<MTPDeviceDelegate> GetAsWeakPtrOnIOThread() = 0;
-
protected:
// Always destruct this object via CancelPendingTasksAndDeleteDelegate().
virtual ~MTPDeviceDelegate() {}
diff --git a/webkit/fileapi/media/mtp_device_map_service.cc b/webkit/fileapi/media/mtp_device_map_service.cc
index e4284e1..07059ad 100644
--- a/webkit/fileapi/media/mtp_device_map_service.cc
+++ b/webkit/fileapi/media/mtp_device_map_service.cc
@@ -13,17 +13,24 @@
namespace fileapi {
+namespace {
+
+base::LazyInstance<MTPDeviceMapService> g_mtp_device_map_service =
+ LAZY_INSTANCE_INITIALIZER;
+
+} // namespace
+
// static
MTPDeviceMapService* MTPDeviceMapService::GetInstance() {
- return Singleton<MTPDeviceMapService>::get();
+ return g_mtp_device_map_service.Pointer();
}
void MTPDeviceMapService::AddDelegate(
const FilePath::StringType& device_location,
MTPDeviceDelegate* delegate) {
- DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(delegate);
DCHECK(!device_location.empty());
+ base::AutoLock lock(lock_);
if (ContainsKey(delegate_map_, device_location))
return;
@@ -32,7 +39,7 @@ void MTPDeviceMapService::AddDelegate(
void MTPDeviceMapService::RemoveDelegate(
const FilePath::StringType& device_location) {
- DCHECK(thread_checker_.CalledOnValidThread());
+ base::AutoLock lock(lock_);
DelegateMap::iterator it = delegate_map_.find(device_location);
DCHECK(it != delegate_map_.end());
it->second->CancelPendingTasksAndDeleteDelegate();
@@ -41,25 +48,22 @@ void MTPDeviceMapService::RemoveDelegate(
MTPDeviceDelegate* MTPDeviceMapService::GetMTPDeviceDelegate(
const std::string& filesystem_id) {
- DCHECK(thread_checker_.CalledOnValidThread());
FilePath device_path;
if (!IsolatedContext::GetInstance()->GetRegisteredPath(filesystem_id,
&device_path)) {
return NULL;
}
- FilePath::StringType device_location = device_path.value();
+ const FilePath::StringType& device_location = device_path.value();
DCHECK(!device_location.empty());
+ base::AutoLock lock(lock_);
DelegateMap::const_iterator it = delegate_map_.find(device_location);
DCHECK(it != delegate_map_.end());
return it->second;
}
MTPDeviceMapService::MTPDeviceMapService() {
- // This object is constructed on UI Thread but the member functions are
- // accessed on IO thread. Therefore, detach from current thread.
- thread_checker_.DetachFromThread();
}
MTPDeviceMapService::~MTPDeviceMapService() {}
diff --git a/webkit/fileapi/media/mtp_device_map_service.h b/webkit/fileapi/media/mtp_device_map_service.h
index 6849976..686d1cb 100644
--- a/webkit/fileapi/media/mtp_device_map_service.h
+++ b/webkit/fileapi/media/mtp_device_map_service.h
@@ -8,9 +8,8 @@
#include <map>
#include "base/file_path.h"
-#include "base/memory/singleton.h"
-#include "base/memory/weak_ptr.h"
-#include "base/threading/thread_checker.h"
+#include "base/lazy_instance.h"
+#include "base/synchronization/lock.h"
#include "webkit/storage/webkit_storage_export.h"
namespace fileapi {
@@ -19,30 +18,32 @@ class MTPDeviceDelegate;
// This class provides media transfer protocol (MTP) device delegate to
// complete media file system operations. ScopedMTPDeviceMapEntry class
-// manages the device map entries. This class operates on the IO thread.
+// manages the device map entries.
class WEBKIT_STORAGE_EXPORT MTPDeviceMapService {
public:
static MTPDeviceMapService* GetInstance();
// Adds the MTP device delegate to the map service. |device_location|
// specifies the mount location of the MTP device.
- // Called on the IO thread.
+ // Called on a media task runner thread.
void AddDelegate(const FilePath::StringType& device_location,
MTPDeviceDelegate* delegate);
// Removes the MTP device delegate from the map service. |device_location|
// specifies the mount location of the MTP device.
- // Called on the IO thread.
+ // Called on the UI thread.
void RemoveDelegate(const FilePath::StringType& device_location);
// Gets the media device delegate associated with |filesystem_id|.
// Return NULL if the |filesystem_id| is no longer valid (e.g. because the
- // corresponding device is detached etc).
- // Called on the IO thread.
+ // corresponding device is detached, etc).
+ // Called on a media task runner thread.
+ // TODO(thestig) DCHECK AddDelegate() and GetMTPDeviceDelegate() are actually
+ // called on the same task runner.
MTPDeviceDelegate* GetMTPDeviceDelegate(const std::string& filesystem_id);
private:
- friend struct DefaultSingletonTraits<MTPDeviceMapService>;
+ friend struct base::DefaultLazyInstanceTraits<MTPDeviceMapService>;
// Mapping of device_location and MTPDeviceDelegate* object. It is safe to
// store and access the raw pointer. This class operates on the IO thread.
@@ -54,9 +55,7 @@ class WEBKIT_STORAGE_EXPORT MTPDeviceMapService {
// Map of attached mtp device delegates.
DelegateMap delegate_map_;
-
- // Object to verify all methods of this class are called on the same thread.
- base::ThreadChecker thread_checker_;
+ base::Lock lock_;
DISALLOW_COPY_AND_ASSIGN(MTPDeviceMapService);
};
generated by cgit v1.1 at 2025-04-05 14:46:55 +0000