Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2030)

Unified Diff: webkit/plugins/ppapi/ppb_file_ref_impl.cc

Issue 16155009: Update webkit/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/plugins/ppapi/ppb_buffer_impl.cc ('k') | webkit/plugins/ppapi/ppb_var_deprecated_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/ppapi/ppb_file_ref_impl.cc
diff --git a/webkit/plugins/ppapi/ppb_file_ref_impl.cc b/webkit/plugins/ppapi/ppb_file_ref_impl.cc
index fd814f20539b2f8f4ad32e0d82144d8a5d29b6a8..2bd1eabf671789e8f6710ff2b389eeacc4b31118 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_) {
« no previous file with comments | « webkit/plugins/ppapi/ppb_buffer_impl.cc ('k') | webkit/plugins/ppapi/ppb_var_deprecated_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698