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

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

Issue 7629017: Add a unified resource tracker shared between the proxy and the impl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments Created 9 years, 4 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
Index: webkit/plugins/ppapi/ppb_file_chooser_impl.cc
diff --git a/webkit/plugins/ppapi/ppb_file_chooser_impl.cc b/webkit/plugins/ppapi/ppb_file_chooser_impl.cc
index 5fd777e45492eb01b34c7158ea93b4e2a6cf3c14..88ef8c4b3a0e9dca81cf52e1dacf6257f962824c 100644
--- a/webkit/plugins/ppapi/ppb_file_chooser_impl.cc
+++ b/webkit/plugins/ppapi/ppb_file_chooser_impl.cc
@@ -80,9 +80,7 @@ PP_Resource PPB_FileChooser_Impl::Create(
if ((options->mode != PP_FILECHOOSERMODE_OPEN) &&
(options->mode != PP_FILECHOOSERMODE_OPENMULTIPLE))
return 0;
-
- PPB_FileChooser_Impl* chooser = new PPB_FileChooser_Impl(instance, options);
- return chooser->GetReference();
+ return (new PPB_FileChooser_Impl(instance, options))->GetReference();
}
PPB_FileChooser_Impl* PPB_FileChooser_Impl::AsPPB_FileChooser_Impl() {
@@ -129,10 +127,8 @@ void PPB_FileChooser_Impl::RegisterCallback(
DCHECK(callback.func);
DCHECK(!callback_.get() || callback_->completed());
- PP_Resource resource_id = GetReferenceNoAddRef();
- CHECK(resource_id);
callback_ = new TrackedCompletionCallback(
- instance()->module()->GetCallbackTracker(), resource_id, callback);
+ instance()->module()->GetCallbackTracker(), pp_resource(), callback);
}
void PPB_FileChooser_Impl::RunCallback(int32_t result) {

Powered by Google App Engine
This is Rietveld 408576698