diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 23:47:38 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 23:47:38 +0000 |
| commit | ff875be5f3f3db4cdc5bbfe4a014580867c7a044 (patch) | |
| tree | e59c4716dc0b4bd427dd84bfa8e15a16aaf50eab /webkit/plugins/ppapi/ppb_file_ref_impl.cc | |
| parent | ed264deb5072425ac355bf4b4cc3d43059ddae94 (diff) | |
| download | chromium_src-ff875be5f3f3db4cdc5bbfe4a014580867c7a044.zip chromium_src-ff875be5f3f3db4cdc5bbfe4a014580867c7a044.tar.gz chromium_src-ff875be5f3f3db4cdc5bbfe4a014580867c7a044.tar.bz2 | |
Update webkit/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes
BUG=110610
TBR=darin
Review URL: https://chromiumcodereview.appspot.com/16155009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/ppapi/ppb_file_ref_impl.cc')
| -rw-r--r-- | webkit/plugins/ppapi/ppb_file_ref_impl.cc | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/webkit/plugins/ppapi/ppb_file_ref_impl.cc b/webkit/plugins/ppapi/ppb_file_ref_impl.cc index fd814f2..2bd1eab 100644 --- a/webkit/plugins/ppapi/ppb_file_ref_impl.cc +++ b/webkit/plugins/ppapi/ppb_file_ref_impl.cc @@ -123,7 +123,7 @@ void GetFileInfoCallback( base::PlatformFileError error_code, const base::PlatformFileInfo& file_info) { base::FileUtilProxy::Close( - task_runner, file, base::Bind(&IgnoreCloseCallback)); + task_runner.get(), file, base::Bind(&IgnoreCloseCallback)); if (!TrackedCallback::IsPending(callback)) return; @@ -156,11 +156,12 @@ void QueryCallback(scoped_refptr<base::TaskRunner> task_runner, base::PlatformFile file = passed_file.ReleaseValue(); if (!base::FileUtilProxy::GetFileInfoFromPlatformFile( - task_runner, file, - base::Bind(&GetFileInfoCallback, task_runner, file, info, - callback))) { + task_runner.get(), + file, + base::Bind( + &GetFileInfoCallback, task_runner, file, info, callback))) { base::FileUtilProxy::Close( - task_runner, file, base::Bind(&IgnoreCloseCallback)); + task_runner.get(), file, base::Bind(&IgnoreCloseCallback)); callback->Run(PP_ERROR_FAILED); } } @@ -313,7 +314,7 @@ PP_Resource PPB_FileRef_Impl::GetParent() { scoped_refptr<PPB_FileRef_Impl> parent_ref( CreateInternal(pp_instance(), file_system_, parent_path)); - if (!parent_ref) + if (!parent_ref.get()) return 0; return parent_ref->GetReference(); } @@ -393,9 +394,9 @@ int32_t PPB_FileRef_Impl::Rename(PP_Resource new_pp_file_ref, PP_Var PPB_FileRef_Impl::GetAbsolutePath() { if (GetFileSystemType() != PP_FILESYSTEMTYPE_EXTERNAL) return GetPath(); - if (!external_path_var_) { - external_path_var_ = new StringVar( - external_file_system_path_.AsUTF8Unsafe()); + if (!external_path_var_.get()) { + external_path_var_ = + new StringVar(external_file_system_path_.AsUTF8Unsafe()); } return external_path_var_->GetPPVar(); } @@ -461,7 +462,7 @@ int32_t PPB_FileRef_Impl::QueryInHost( scoped_refptr<TrackedCallback> callback) { scoped_refptr<PluginInstance> plugin_instance = ResourceHelper::GetPluginInstance(this); - if (!plugin_instance) + if (!plugin_instance.get()) return PP_ERROR_FAILED; if (!file_system_) { |