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

Unified Diff: webkit/plugins/ppapi/ppb_flash_menu_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_flash_menu_impl.cc
diff --git a/webkit/plugins/ppapi/ppb_flash_menu_impl.cc b/webkit/plugins/ppapi/ppb_flash_menu_impl.cc
index 959d9e2b4101f0e4878acaf053d9fcb46a8303c1..80faa25854df49acd68896b1191a53f4e95597b6 100644
--- a/webkit/plugins/ppapi/ppb_flash_menu_impl.cc
+++ b/webkit/plugins/ppapi/ppb_flash_menu_impl.cc
@@ -141,18 +141,12 @@ int32_t PPB_Flash_Menu_Impl::Show(const PP_Point* location,
if (callback_.get() && !callback_->completed())
return PP_ERROR_INPROGRESS;
- PP_Resource resource_id = GetReferenceNoAddRef();
- if (!resource_id) {
- NOTREACHED();
- return PP_ERROR_FAILED;
- }
-
int32_t rv = instance()->delegate()->ShowContextMenu(
instance(), this, gfx::Point(location->x, location->y));
if (rv == PP_OK_COMPLETIONPENDING) {
// Record callback and output buffers.
callback_ = new TrackedCompletionCallback(
- instance()->module()->GetCallbackTracker(), resource_id, callback);
+ instance()->module()->GetCallbackTracker(), pp_resource(), callback);
selected_id_out_ = selected_id_out;
} else {
// This should never be completed synchronously successfully.

Powered by Google App Engine
This is Rietveld 408576698