diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-20 17:38:39 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-20 17:38:39 +0000 |
| commit | 55eb70e76bd17909cc5202c5a9af3e1c886989e4 (patch) | |
| tree | 9ea8a13b9f9e1ab0297ea0ff79093dc4c5ad20d0 /webkit/fileapi | |
| parent | 7edf30319847892be800a0127fee985a24050166 (diff) | |
| download | chromium_src-55eb70e76bd17909cc5202c5a9af3e1c886989e4.zip chromium_src-55eb70e76bd17909cc5202c5a9af3e1c886989e4.tar.gz chromium_src-55eb70e76bd17909cc5202c5a9af3e1c886989e4.tar.bz2 | |
Move creation of BrowserContext objects that live in content to content, instead of depending on the embedder. Apart from allowing us to hide more of content from embedders, it simplifies the work that every embedder has to do (see the change the shell_browser_context.cc as an example).
BUG=98716
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=122521
Review URL: https://chromiumcodereview.appspot.com/9419033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122768 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi')
| -rw-r--r-- | webkit/fileapi/file_system_context.cc | 4 | ||||
| -rw-r--r-- | webkit/fileapi/sandbox_mount_point_provider.cc | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/webkit/fileapi/file_system_context.cc b/webkit/fileapi/file_system_context.cc index 2bee4f3..600518e 100644 --- a/webkit/fileapi/file_system_context.cc +++ b/webkit/fileapi/file_system_context.cc @@ -141,8 +141,8 @@ FileSystemContext::external_provider() const { } void FileSystemContext::DeleteOnCorrectThread() const { - if (!io_message_loop_->BelongsToCurrentThread()) { - io_message_loop_->DeleteSoon(FROM_HERE, this); + if (!io_message_loop_->BelongsToCurrentThread() && + io_message_loop_->DeleteSoon(FROM_HERE, this)) { return; } delete this; diff --git a/webkit/fileapi/sandbox_mount_point_provider.cc b/webkit/fileapi/sandbox_mount_point_provider.cc index e79624e..cbcda1d 100644 --- a/webkit/fileapi/sandbox_mount_point_provider.cc +++ b/webkit/fileapi/sandbox_mount_point_provider.cc @@ -316,8 +316,11 @@ SandboxMountPointProvider::SandboxMountPointProvider( } SandboxMountPointProvider::~SandboxMountPointProvider() { - if (!file_message_loop_->BelongsToCurrentThread()) - file_message_loop_->ReleaseSoon(FROM_HERE, sandbox_file_util_.release()); + if (!file_message_loop_->BelongsToCurrentThread()) { + ObfuscatedFileUtil* sandbox_file_util = sandbox_file_util_.release(); + if (!file_message_loop_->ReleaseSoon(FROM_HERE, sandbox_file_util)) + sandbox_file_util->Release(); + } } void SandboxMountPointProvider::ValidateFileSystemRoot( |