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

Unified Diff: content/common/npobject_proxy.cc

Issue 8741005: Shim calls to NPN_MemAlloc/MemFree through PluginHost (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 | « no previous file | content/common/npobject_stub.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/npobject_proxy.cc
diff --git a/content/common/npobject_proxy.cc b/content/common/npobject_proxy.cc
index 4a376116bd057cf6e71d063649f83114be8febbf..0ee801c3c5523c897b516a1200e5e2b021b0c6fe 100644
--- a/content/common/npobject_proxy.cc
+++ b/content/common/npobject_proxy.cc
@@ -10,6 +10,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
#include "webkit/glue/webkit_glue.h"
#include "webkit/plugins/npapi/plugin_instance.h"
+#include "webkit/plugins/npapi/plugin_host.h"
using WebKit::WebBindings;
@@ -384,7 +385,8 @@ bool NPObjectProxy::NPNEnumerate(NPObject *obj,
*count = static_cast<unsigned int>(value_param.size());
*value = static_cast<NPIdentifier *>(
- NPN_MemAlloc(sizeof(NPIdentifier) * *count));
+ webkit::npapi::PluginHost::Singleton()->host_functions()->memalloc(
+ sizeof(NPIdentifier) * *count));
for (unsigned int i = 0; i < *count; ++i)
(*value)[i] = CreateNPIdentifier(value_param[i]);
« no previous file with comments | « no previous file | content/common/npobject_stub.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698